Resolve conflicts (#8777)

(cherry picked from commit 0f9490c)

Author: michaelklishin

MODULE.bazel

@@ -387,11 +387,6 @@ erlang_dev_package = use_extension(
 erlang_dev_package.hex_package(
     name = "amqp",
     build_file = "@rabbitmq-server//bazel:BUILD.amqp",
-<<<<<<< HEAD
-=======
-    patch_args = ["-p1"],
-    patches = ["@rabbitmq-server//bazel:amqp.patch"],
->>>>>>> 3d7db702c6 (Adopt otp 25.2.3)
     sha256 = "b6d926770e4508e30e3e9e476c57b6c8aeda44f7715663bdc38935620ce5be6f",
     version = "2.1.1",
 )