chore: fix merge conflicts

packages/cli/src/ui/AppContainer.tsx

@@ -2297,14 +2297,11 @@ Logging in with Google... Restarting Gemini CLI to continue.
         }
         setNewAgents(null);
       },
-<<<<<<< HEAD
-=======
       getPreferredEditor,
       clearAccountSuspension: () => {
         setAccountSuspensionInfo(null);
         setAuthState(AuthState.Updating);
       },
->>>>>>> ea48bd941 (feat: better error messages (#20577))
     }),
     [
       handleThemeSelect,
@@ -2356,6 +2353,7 @@ Logging in with Google... Restarting Gemini CLI to continue.
       newAgents,
       config,
       historyManager,
+      getPreferredEditor,
     ],
   );
 

packages/cli/src/ui/contexts/UIActionsContext.tsx

@@ -82,11 +82,8 @@ export interface UIActions {
   setAuthContext: (context: { requiresRestart?: boolean }) => void;
   handleRestart: () => void;
   handleNewAgentsSelect: (choice: NewAgentsChoice) => Promise<void>;
-<<<<<<< HEAD
-=======
   getPreferredEditor: () => EditorType | undefined;
   clearAccountSuspension: () => void;
->>>>>>> ea48bd941 (feat: better error messages (#20577))
 }
 
 export const UIActionsContext = createContext<UIActions | null>(null);