Resolve a conflict #12704 #12706 #12194

Author: michaelklishin

rabbitmq-components.mk

@@ -122,10 +122,7 @@ dep_gen_batch_server = hex 0.8.8
 dep_jose = hex 1.11.10
 dep_khepri = hex 0.16.0
 dep_khepri_mnesia_migration = hex 0.7.0
-<<<<<<< HEAD
-=======
 dep_osiris = git https://github.com/rabbitmq/osiris v1.8.4
->>>>>>> 5f4715979c (Osiris v1.8.4)
 dep_prometheus = hex 4.11.0
 dep_ra = hex 2.14.0
 dep_ranch = hex 2.1.0