From 518d5335d29a7ca8f7dbd957750152ca1d2c9adb Mon Sep 17 00:00:00 2001
From: Dave <futurechimp@users.noreply.github.com>
Date: Tue, 24 Feb 2026 13:22:15 +0000
Subject: [PATCH] story-kit: merge
 133_story_clean_up_agent_state_on_story_archive_and_add_ttl_for_completed_entries

---
 server/src/agents.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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