Resolve a conflict

Author: michaelklishin

rabbitmq-components.mk

@@ -115,13 +115,8 @@ dep_cowboy = hex 2.8.0
 dep_cowlib = hex 2.9.1
 dep_jsx = hex 3.1.0
 dep_looking_glass = git https://github.com/rabbitmq/looking_glass master
-<<<<<<< HEAD
-dep_prometheus = git https://github.com/deadtrickster/prometheus.erl 06425c21a39c1564164f1cc3fe5bdfa8b23b1f78
-dep_ra = hex 2.0.6
-=======
 dep_prometheus = hex 4.8.2
-dep_ra = git https://github.com/rabbitmq/ra.git main
->>>>>>> 2a24662127 (Update Prometheus.erl to 4.8.2)
+dep_ra = hex 2.0.6
 dep_ranch = hex 2.1.0
 dep_recon = hex 2.5.2
 dep_redbug = hex 2.0.7