diff --git a/src/runtime/extern_registry.rs b/src/runtime/extern_registry.rs
index 2e7d2e70..6bc018ab 100644
--- a/src/runtime/extern_registry.rs
+++ b/src/runtime/extern_registry.rs
@@ -34,17 +34,10 @@ static EXTERNS: Lazy<Vec<ExternSpec>> = Lazy::new(|| vec![
     ExternSpec { iface: "env.future", method: "birth", min_arity: 1, max_arity: 1, slot: Some(20) },
     ExternSpec { iface: "env.future", method: "set", min_arity: 2, max_arity: 2, slot: Some(21) },
     ExternSpec { iface: "env.future", method: "await", min_arity: 1, max_arity: 1, slot: Some(22) },
-<<<<<<< HEAD
     // core-13 pure support shims
     ExternSpec { iface: "env.local", method: "get", min_arity: 1, max_arity: 1, slot: Some(40) },
     ExternSpec { iface: "env.local", method: "set", min_arity: 2, max_arity: 2, slot: Some(41) },
     ExternSpec { iface: "env.box", method: "new", min_arity: 1, max_arity: 255, slot: Some(50) },
-=======
-    // core-13 pure support shims
-    ExternSpec { iface: "env.local", method: "get", min_arity: 1, max_arity: 1, slot: Some(40) },
-    ExternSpec { iface: "env.local", method: "set", min_arity: 2, max_arity: 2, slot: Some(41) },
-    ExternSpec { iface: "env.box", method: "new", min_arity: 1, max_arity: 255, slot: Some(50) },
->>>>>>> cranelift-dev
 ]);
 
 pub fn resolve(iface: &str, method: &str) -> Option<ExternSpec> {