diff --git a/packages/cli/src/ui/AppContainer.tsx b/packages/cli/src/ui/AppContainer.tsx
index 75b8b20db56..c008c130787 100644
--- a/packages/cli/src/ui/AppContainer.tsx
+++ b/packages/cli/src/ui/AppContainer.tsx
@@ -458,7 +458,10 @@ Logging in with Google... Please restart Gemini CLI to continue.
     setIsProcessing,
     setGeminiMdFileCount,
     slashCommandActions,
+<<<<<<< HEAD
     extensionsUpdateState,
+=======
+>>>>>>> ad21c109 (Fix MCP prompt slash commands not appearing. (#8290))
     isConfigInitialized,
   );
 
diff --git a/packages/cli/src/ui/hooks/slashCommandProcessor.ts b/packages/cli/src/ui/hooks/slashCommandProcessor.ts
index 5b22f5d1984..b3dce03aa5e 100644
--- a/packages/cli/src/ui/hooks/slashCommandProcessor.ts
+++ b/packages/cli/src/ui/hooks/slashCommandProcessor.ts
@@ -64,7 +64,10 @@ export const useSlashCommandProcessor = (
   setIsProcessing: (isProcessing: boolean) => void,
   setGeminiMdFileCount: (count: number) => void,
   actions: SlashCommandProcessorActions,
+<<<<<<< HEAD
   extensionsUpdateState: Map<string, ExtensionUpdateState>,
+=======
+>>>>>>> ad21c109 (Fix MCP prompt slash commands not appearing. (#8290))
   isConfigInitialized: boolean,
 ) => {
   const session = useSessionStats();