diff --git a/server/src/agents.rs b/server/src/agents.rs
index b0c9a14..e5d9be2 100644
--- a/server/src/agents.rs
+++ b/server/src/agents.rs
@@ -4806,7 +4806,6 @@ ours
     #[test]
     fn resolve_simple_conflicts_malformed_no_end() {
         let input = "\
-<<<<<<< HEAD
 ours
 theirs
 ";
@@ -5083,6 +5082,7 @@ 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