Resolve a conflict #11768 #11769 #11765

Author: michaelklishin

MODULE.bazel

@@ -260,13 +260,8 @@ erlang_package.hex_package(
     name = "ra",
     build_file = "@rabbitmq-server//bazel:BUILD.ra",
     pkg = "ra",
-<<<<<<< HEAD
-    sha256 = "1db9c7ed5e5183836c416dd2198c3b414f7542d15603944aa6f5034aef90c890",
-    version = "2.11.0",
-=======
     sha256 = "038f026a4f43d7d35e4587ec3f7ef51830d79aa318abfd052d38c13eb09c26ee",
     version = "2.13.3",
->>>>>>> a6a2f645e0 (Ra v2.13.3)
 )
 
 erlang_package.git_package(

rabbitmq-components.mk

@@ -123,11 +123,7 @@ dep_khepri = hex 0.14.0
 dep_khepri_mnesia_migration = hex 0.5.0
 dep_looking_glass = git https://github.com/rabbitmq/looking_glass.git main
 dep_prometheus = hex 4.11.0
-<<<<<<< HEAD
-dep_ra = hex 2.11.0
-=======
 dep_ra = hex 2.13.3
->>>>>>> a6a2f645e0 (Ra v2.13.3)
 dep_ranch = hex 2.1.0
 dep_recon = hex 2.5.3
 dep_redbug = hex 2.0.7