diff --git a/Cargo.lock b/Cargo.lock
index 1ff780b38..bb839dc6d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5826,8 +5826,8 @@ dependencies = [
  "anyhow",
  "async-trait",
  "chrono",
+ "common",
  "lru",
- "ml",
  "parking_lot 0.12.5",
  "semver 1.0.27",
  "serde",
diff --git a/ml/src/hyperopt/campaign.rs b/ml/src/hyperopt/campaign.rs
index 50281bf0d..57a2965d1 100644
--- a/ml/src/hyperopt/campaign.rs
+++ b/ml/src/hyperopt/campaign.rs
@@ -108,13 +108,8 @@ pub fn run_campaign(config: &CampaignConfig) -> anyhow::Result<CampaignResults>
         ModelType::PPO => {
             anyhow::bail!("PPO campaign not yet implemented")
         }
-<<<<<<< HEAD
         other => {
             anyhow::bail!("Hyperopt campaign not supported for model type: {}", other)
-=======
-        _ => {
-            anyhow::bail!("Campaign not supported for model type: {:?}", config.model_type)
->>>>>>> dd4532a3 (refactor: unify ModelType into common/model_types.rs)
         }
     }
 }
diff --git a/model_loader/src/lib.rs b/model_loader/src/lib.rs
index 52d333571..f0b46097d 100644
--- a/model_loader/src/lib.rs
+++ b/model_loader/src/lib.rs
@@ -373,17 +373,17 @@ mod tests {
     use super::*;
 
     #[test]
-<<<<<<< HEAD
     fn test_model_type_s3_prefix() {
         assert_eq!(ModelType::TLOB.s3_prefix(), "tlob_transformer");
         assert_eq!(ModelType::DQN.s3_prefix(), "dqn");
         assert_eq!(ModelType::MAMBA.s3_prefix(), "mamba2");
-=======
+    }
+
+    #[test]
     fn test_model_type_as_str() {
-        assert_eq!(ModelType::TLOB.as_str(), "tlob_transformer");
+        assert_eq!(ModelType::TLOB.as_str(), "tlob");
         assert_eq!(ModelType::DQN.as_str(), "dqn");
-        assert_eq!(ModelType::MAMBA.as_str(), "mamba2");
->>>>>>> dd4532a3 (refactor: unify ModelType into common/model_types.rs)
+        assert_eq!(ModelType::MAMBA.as_str(), "mamba");
     }
 
     #[test]