diff --git a/ddl/metadatalocktest/BUILD.bazel b/ddl/metadatalocktest/BUILD.bazel
index 63c8833897539..9679742c5121a 100644
--- a/ddl/metadatalocktest/BUILD.bazel
+++ b/ddl/metadatalocktest/BUILD.bazel
@@ -7,10 +7,6 @@ go_test(
         "mdl_test.go",
     ],
     flaky = True,
-<<<<<<< HEAD
-=======
-    shard_count = 32,
->>>>>>> cde395dc597 (ddl, domain: fix a bug which causes MDL blocking (#43781))
     deps = [
         "//config",
         "//ddl",