Resolve a conflict (#8458)

(cherry picked from commit 13882dc)

Author: michaelklishin

deps/rabbit/BUILD.bazel

@@ -309,11 +309,7 @@ rabbitmq_integration_suite(
 rabbitmq_integration_suite(
     name = "classic_queue_prop_SUITE",
     size = "large",
-<<<<<<< HEAD
-    shard_count = 5,
-=======
     shard_count = 6,
->>>>>>> 74bb4c57a6 (fixup! fixup! Tests for "Handle missing delivery marker in CQ v1 index")
     sharding_method = "case",
     deps = [
         "@proper//:erlang_app",