diff --git a/server/src/agents.rs b/server/src/agents.rs
index 800bb32..b0c9a14 100644
--- a/server/src/agents.rs
+++ b/server/src/agents.rs
@@ -5083,7 +5083,6 @@ theirs
         assert!(report.had_conflicts, "should report conflicts");
     }
 
-<<<<<<< HEAD
     // ── process health monitoring tests ──────────────────────────────────────
 
     /// Demonstrates that the PTY read-loop inactivity timeout fires when no output
@@ -5161,7 +5160,8 @@ theirs
             matches!(event, AgentEvent::Error { .. }),
             "expected AgentEvent::Error, got: {event:?}"
         );
-=======
+    }
+
     // ── remove_agents_for_story tests ────────────────────────────────────────
 
     #[test]