From 832c9cda6b5c7dd215c04d05c08831c108dfc531 Mon Sep 17 00:00:00 2001
From: Sehoon Shon <sshon@google.com>
Date: Tue, 3 Feb 2026 17:19:31 -0500
Subject: [PATCH] resolve merge conflict

---
 packages/cli/src/ui/AppContainer.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/cli/src/ui/AppContainer.tsx b/packages/cli/src/ui/AppContainer.tsx
index 8f254cace7..507837be87 100644
--- a/packages/cli/src/ui/AppContainer.tsx
+++ b/packages/cli/src/ui/AppContainer.tsx
@@ -189,10 +189,6 @@ export const AppContainer = (props: AppContainerProps) => {
   const historyManager = useHistory({
     chatRecordingService: config.getGeminiClient()?.getChatRecordingService(),
   });
-<<<<<<< HEAD
-=======
-
->>>>>>> d63c34b6e (feat(ui): move user identity display to header (#18216))
   useMemoryMonitor(historyManager);
   const settings = useSettings();
   const isAlternateBuffer = useAlternateBuffer();