From d9da5ef31d65ea4540cd3345aec98b9f499ff5dc Mon Sep 17 00:00:00 2001
From: justelson <elsonmgaya25@gmail.com>
Date: Tue, 27 Jan 2026 13:08:48 +0300
Subject: [PATCH] Fix: Remove remaining conflict marker in app-render.ts

---
 ui/src/ui/app-render.ts | 1 -
 1 file changed, 1 deletion(-)

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) => {