Resolve a conflict #12785 #12789

Author: michaelklishin

rabbitmq-components.mk

@@ -121,13 +121,8 @@ dep_cuttlefish = hex 3.4.0
 dep_gen_batch_server = hex 0.8.8
 dep_jose = hex 1.11.10
 dep_khepri = hex 0.16.0
-<<<<<<< HEAD
 dep_khepri_mnesia_migration = hex 0.7.0
-dep_osiris = git https://github.com/rabbitmq/osiris v1.8.4
-=======
-dep_khepri_mnesia_migration = hex 0.7.1
 dep_osiris = git https://github.com/rabbitmq/osiris v1.8.5
->>>>>>> 675007a20b (Update osiris to v1.8.5)
 dep_prometheus = hex 4.11.0
 dep_ra = hex 2.14.0
 dep_ranch = hex 2.1.0