diff --git a/desktop/src/pages/Settings.tsx b/desktop/src/pages/Settings.tsx
index b5dadf54..05cc39ac 100644
--- a/desktop/src/pages/Settings.tsx
+++ b/desktop/src/pages/Settings.tsx
@@ -614,7 +614,6 @@ function GeneralSettings() {
   )
 }
 
-<<<<<<< HEAD
 // ─── Agents Settings ──────────────────────────────────────
 
 const AGENT_COLORS: Record<string, string> = {