diff --git a/codex-rs/analytics/src/analytics_client.rs b/codex-rs/analytics/src/analytics_client.rs
index b9236771b4..ab5f5cb447 100644
--- a/codex-rs/analytics/src/analytics_client.rs
+++ b/codex-rs/analytics/src/analytics_client.rs
@@ -542,7 +542,6 @@ impl AnalyticsReducer {
             event.thread_id.clone(),
             ThreadState {
                 _initialized_event: event.clone(),
->>>>>>> origin/rhan/oob-thread-metadata
             },
         );
         out.push(TrackEventRequest::ThreadInitialized(
diff --git a/codex-rs/analytics/src/lib.rs b/codex-rs/analytics/src/lib.rs
index 0c19744c13..2a486cdc67 100644
--- a/codex-rs/analytics/src/lib.rs
+++ b/codex-rs/analytics/src/lib.rs
@@ -6,14 +6,10 @@ pub use analytics_client::AnalyticsReducer;
 pub use analytics_client::AppInvocation;
 pub use analytics_client::AppMentionedInput;
 pub use analytics_client::AppUsedInput;
-<<<<<<< HEAD
-pub use analytics_client::CodexThreadInitializedEvent;
-pub use analytics_client::CodexTurnEvent;
-=======
 pub use analytics_client::CodexThreadContext;
 pub use analytics_client::CodexThreadInitializedEvent;
 pub use analytics_client::CodexThreadInitializedInput;
->>>>>>> origin/rhan/oob-thread-metadata
+pub use analytics_client::CodexTurnEvent;
 pub use analytics_client::InitializationMode;
 pub use analytics_client::InvocationType;
 pub use analytics_client::PluginState;
@@ -21,9 +17,5 @@ pub use analytics_client::PluginStateChangedInput;
 pub use analytics_client::PluginUsedInput;
 pub use analytics_client::SkillInvocation;
 pub use analytics_client::SkillInvokedInput;
-<<<<<<< HEAD
-pub use analytics_client::ThreadInitializedInput;
-=======
->>>>>>> origin/rhan/oob-thread-metadata
 pub use analytics_client::TrackEventsContext;
 pub use analytics_client::build_track_events_context;
diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs
index 47ec1dda79..0b35b91f67 100644
--- a/codex-rs/core/src/codex.rs
+++ b/codex-rs/core/src/codex.rs
@@ -351,13 +351,9 @@ use crate::util::backoff;
 use crate::windows_sandbox::WindowsSandboxLevelExt;
 use codex_analytics::AnalyticsEventsClient;
 use codex_analytics::AppInvocation;
-<<<<<<< HEAD
-use codex_analytics::CodexThreadInitializedEvent;
 use codex_analytics::CodexTurnEvent;
-=======
 use codex_analytics::CodexThreadContext;
 use codex_analytics::CodexThreadInitializedInput;
->>>>>>> origin/rhan/oob-thread-metadata
 use codex_analytics::InitializationMode;
 use codex_analytics::InvocationType;
 use codex_analytics::build_track_events_context;