diff --git a/src/agent/session.rs b/src/agent/session.rs
index 548105c2..2b79e77a 100644
--- a/src/agent/session.rs
+++ b/src/agent/session.rs
@@ -1744,7 +1744,6 @@ mod tests {
     }
 
     #[test]
-<<<<<<< HEAD
     fn test_record_tool_result_for_by_id() {
         let mut turn = Turn::new(0, "test");
         turn.record_tool_call_with_reasoning(
diff --git a/src/agent/session_manager.rs b/src/agent/session_manager.rs
index e7144bea..7736f85f 100644
--- a/src/agent/session_manager.rs
+++ b/src/agent/session_manager.rs
@@ -966,7 +966,7 @@ mod tests {
         let adopted_id = Uuid::new_v4();
         {
             let mut sess = session1.lock().await;
-            let thread = Thread::with_id(adopted_id, sess.id);
+            let thread = Thread::with_id(adopted_id, sess.id, None);
             sess.threads.insert(adopted_id, thread);
         }
         // Resolve with the UUID as external_thread_id -- should adopt it
@@ -1020,7 +1020,6 @@ mod tests {
     }
 
     #[tokio::test]
-<<<<<<< HEAD
     async fn test_resolve_thread_with_pre_parsed_uuid_adopts_thread() {
         use crate::agent::session::Thread;
 
@@ -1031,7 +1030,7 @@ mod tests {
         let known_id = Uuid::new_v4();
         {
             let mut sess = session.lock().await;
-            let thread = Thread::with_id(known_id, sess.id);
+            let thread = Thread::with_id(known_id, sess.id, None);
             sess.threads.insert(known_id, thread);
         }
 
@@ -1058,7 +1057,7 @@ mod tests {
         let known_id = Uuid::new_v4();
         {
             let mut sess = session.lock().await;
-            let thread = Thread::with_id(known_id, sess.id);
+            let thread = Thread::with_id(known_id, sess.id, None);
             sess.threads.insert(known_id, thread);
         }
 
@@ -1082,7 +1081,7 @@ mod tests {
         let known_id = Uuid::new_v4();
         {
             let mut sess = session.lock().await;
-            let thread = Thread::with_id(known_id, sess.id);
+            let thread = Thread::with_id(known_id, sess.id, None);
             sess.threads.insert(known_id, thread);
         }
 
diff --git a/src/db/libsql/users.rs b/src/db/libsql/users.rs
index f9ddfda9..a317b4d5 100644
--- a/src/db/libsql/users.rs
+++ b/src/db/libsql/users.rs
@@ -981,7 +981,7 @@ mod tests {
         assert!(alice_stats.last_active_at.is_some());
 
         // Bob has no LLM calls so doesn't appear in summary stats
-        assert!(stats.iter().find(|s| s.user_id == "bob").is_none());
+        assert!(!stats.iter().any(|s| s.user_id == "bob"));
 
         // Filter to single user
         let alice_only = db.user_summary_stats(Some("alice")).await.unwrap();
diff --git a/src/tenant.rs b/src/tenant.rs
index b8af5d84..abf229d3 100644
--- a/src/tenant.rs
+++ b/src/tenant.rs
@@ -278,7 +278,7 @@ impl TenantScope {
         thread_id: Option<&str>,
     ) -> Result<bool, DatabaseError> {
         self.inner
-            .ensure_conversation(id, channel, &self.user_id, thread_id)
+            .ensure_conversation(id, channel, &self.user_id, thread_id, None)
             .await
     }