Resolve a conflict (#9476)

michaelklishin · michaelklishin · commit 7992b2065759 · 2023-09-19T18:44:06.000-04:00
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -181,12 +181,7 @@ rabbitmq_run_command(
     subcommand = "stop-node",
 )
 
-<<<<<<< HEAD
-# Allow us to `bazel run start-cluster`
-=======
-
 # Allows us to `bazel run start-cluster`
->>>>>>> 439bc35916 (BUILD.bazel: fix a few typos)
 # for the equivalent of `make start-cluster`
 rabbitmq_run_command(
     name = "start-cluster",
