Fix conflicts in Gemfile and Gemfile.lock

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
 

Gemfile.lock

@@ -634,11 +634,7 @@ GEM
       parser
       unparser
     procto (0.0.3)
-<<<<<<< HEAD
-    prometheus-client-mmap (0.9.1)
-=======
     prometheus-client-mmap (0.9.3)
->>>>>>> b884cfc6c2... Merge branch 'sh-bump-prometheus-client-mmap' into 'master'
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -1137,11 +1133,7 @@ DEPENDENCIES
   peek-sidekiq (~> 1.0.3)
   pg (~> 0.18.2)
   premailer-rails (~> 1.9.7)
-<<<<<<< HEAD
-  prometheus-client-mmap (~> 0.9.1)
-=======
   prometheus-client-mmap (~> 0.9.3)
->>>>>>> b884cfc6c2... Merge branch 'sh-bump-prometheus-client-mmap' into 'master'
   pry-byebug (~> 3.4.1)
   pry-rails (~> 0.3.4)
   rack-attack (~> 4.4.1)