BUILD.bazel: fix a few typos

(cherry picked from commit 439bc35)

# Conflicts:
#	BUILD.bazel

Author: michaelklishin

BUILD.bazel

@@ -157,39 +157,44 @@ rabbitmq_run(
     visibility = ["//visibility:public"],
 )
 
-# Allow us to `bazel run broker`
+# Allows us to `bazel run broker`
 # for the equivalent of `make run-broker`
 rabbitmq_run_command(
     name = "broker",
     rabbitmq_run = ":rabbitmq-run",
     subcommand = "run-broker",
 )
 
-# Allow us to `bazel run background-broker`
+# Allows us to `bazel run background-broker`
 # to start a broker in the background
 rabbitmq_run_command(
     name = "background-broker",
     rabbitmq_run = ":rabbitmq-run",
     subcommand = "start-background-broker",
 )
 
-# Allow us to `bazel run stop-broker`
+# Allows us to `bazel run stop-broker`
 # Useful is broker started in the background
 rabbitmq_run_command(
     name = "stop-broker",
     rabbitmq_run = ":rabbitmq-run",
     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",
     rabbitmq_run = ":rabbitmq-run",
     subcommand = "start-cluster",
 )
 
-# Allow us to `bazel run stop-cluster`
+# Allows us to `bazel run stop-cluster`
 # for the equivalent of `make stop-cluster`
 rabbitmq_run_command(
     name = "stop-cluster",