1 files changed, 0 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index e44875f6305..2e231b26e7e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -297,11 +297,7 @@ group :metrics do
   gem 'influxdb', '~> 0.2', require: false
 
   # Prometheus
-<<<<<<< HEAD
-  gem 'prometheus-client-mmap', '~> 0.9.1'
-=======
   gem 'prometheus-client-mmap', '~> 0.9.3'
->>>>>>> b884cfc6c2... Merge branch 'sh-bump-prometheus-client-mmap' into 'master'
   gem 'raindrops', '~> 0.18'
 end