diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock
index de588b25..f82bb828 100644
--- a/mmtk/Cargo.lock
+++ b/mmtk/Cargo.lock
@@ -511,7 +511,11 @@ dependencies = [
 [[package]]
 name = "mmtk"
 version = "0.27.0"
+<<<<<<< HEAD
 source = "git+https://github.com/mmtk/mmtk-core.git?rev=73be50d1fce1c2f6559ffbc5b7a04623ba62e6c4#73be50d1fce1c2f6559ffbc5b7a04623ba62e6c4"
+=======
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=de10fa4c3bc0a2a5010b9ce04a540c63b14dc214#de10fa4c3bc0a2a5010b9ce04a540c63b14dc214"
+>>>>>>> 5d07e8f (Update to mmtk-core PR #1205 (#177))
 dependencies = [
  "atomic 0.6.0",
  "atomic-traits",
@@ -564,7 +568,11 @@ dependencies = [
 [[package]]
 name = "mmtk-macros"
 version = "0.27.0"
+<<<<<<< HEAD
 source = "git+https://github.com/mmtk/mmtk-core.git?rev=73be50d1fce1c2f6559ffbc5b7a04623ba62e6c4#73be50d1fce1c2f6559ffbc5b7a04623ba62e6c4"
+=======
+source = "git+https://github.com/mmtk/mmtk-core.git?rev=de10fa4c3bc0a2a5010b9ce04a540c63b14dc214#de10fa4c3bc0a2a5010b9ce04a540c63b14dc214"
+>>>>>>> 5d07e8f (Update to mmtk-core PR #1205 (#177))
 dependencies = [
  "proc-macro-error",
  "proc-macro2",
diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml
index 8385d026..feddf09c 100644
--- a/mmtk/Cargo.toml
+++ b/mmtk/Cargo.toml
@@ -31,7 +31,11 @@ lazy_static = "1.1"
 # - change branch
 # - change repo name
 # But other changes including adding/removing whitespaces in commented lines may break the CI
+<<<<<<< HEAD
 mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "73be50d1fce1c2f6559ffbc5b7a04623ba62e6c4" }
+=======
+mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "de10fa4c3bc0a2a5010b9ce04a540c63b14dc214" }
+>>>>>>> 5d07e8f (Update to mmtk-core PR #1205 (#177))
 # Uncomment the following to build locally
 # mmtk = { path = "../../mmtk-core" }
 log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }
diff --git a/mmtk/src/api.rs b/mmtk/src/api.rs
index 9269478c..5273ff91 100644
--- a/mmtk/src/api.rs
+++ b/mmtk/src/api.rs
@@ -281,7 +281,7 @@ pub extern "C" fn mmtk_handle_user_collection_request(tls: VMMutatorThread, coll
         // incremental
         2 => SINGLETON.handle_user_collection_request(tls, false, false),
         _ => unreachable!(),
-    }
+    };
 }
 
 #[no_mangle]