Resolve conflict in config/initializers/7_prometheus_metrics.rb

config/initializers/7_prometheus_metrics.rb

@@ -11,19 +11,7 @@ Prometheus::Client.configure do |config|
     config.multiprocess_files_dir ||= Rails.root.join('tmp/prometheus_multiproc_dir')
   end
 
-<<<<<<< HEAD
-  config.pid_provider = -> do
-    wid = Prometheus::Client::Support::Unicorn.worker_id
-    wid = Process.pid if wid.nil?
-    if wid.nil?
-      "process_pid_#{Process.pid}"
-    else
-      "worker_id_#{wid}"
-    end
-  end
-=======
   config.pid_provider = Prometheus::Client::Support::Unicorn.method(:worker_pid_provider)
->>>>>>> aa24f7e1ab... Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into 'master'
 end
 
 Sidekiq.configure_server do |config|