diff --git a/packages/ui/src/components/layout/ContextPanelRail.tsx b/packages/ui/src/components/layout/ContextPanelRail.tsx
index 9aa81e8d..e4eb1381 100644
--- a/packages/ui/src/components/layout/ContextPanelRail.tsx
+++ b/packages/ui/src/components/layout/ContextPanelRail.tsx
@@ -295,7 +295,6 @@ export const ContextPanelRail: React.FC = () => {
     }
     closeContextPanel(directoryKey);
   }, [activeMode, closeContextPanel, directoryKey, githubAuthChecked, githubConnected]);
->>>>>>> origin/release/v1.22.0
 
   const [isSurfacesDialogOpen, setIsSurfacesDialogOpen] = React.useState(false);