Fix merge artifacts

spec/controllers/projects/prometheus/metrics_controller_spec.rb

@@ -8,7 +8,7 @@ describe Projects::Prometheus::MetricsController do
 
   before do
     allow(controller).to receive(:project).and_return(project)
-    allow(project).to receive(:prometheus_service).and_return(prometheus_adapter)
+    allow(controller).to receive(:prometheus_adapter).and_return(prometheus_adapter)
 
     project.add_master(user)
     sign_in(user)

spec/models/environment_spec.rb

@@ -543,9 +543,9 @@ describe Environment do
     end
   end
 
-  describe '#metrics' do
+  describe '#additional_metrics' do
     let(:project) { create(:prometheus_project) }
-    subject { environment.metrics }
+    subject { environment.additional_metrics }
 
     context 'when the environment has metrics' do
       before do