diff --git a/ui/src/ui/app-render.ts b/ui/src/ui/app-render.ts
index 382b1ff56..3bb856503 100644
--- a/ui/src/ui/app-render.ts
+++ b/ui/src/ui/app-render.ts
@@ -441,7 +441,6 @@ export function renderApp(state: AppViewState) {
       : nothing}
 
         ${state.tab === "chat"
-<<<<<<< HEAD
       ? renderChat({
         sessionKey: state.sessionKey,
         onSessionKeyChange: (next) => {