remove merge lines

spec/models/metric_spec.rb

@@ -14,14 +14,9 @@
         group: "service",
         message: "This is a test",
         type: "performance",
-<<<<<<< HEAD
-        product: "reader"
-      }
-=======
         product: "reader",
         sent_to: "rails_console"
        }
->>>>>>> b9a6332b0 (metric and spec file updated)
     end
 
     it "creates a javascript metric for performance" do
@@ -46,23 +41,15 @@
     end
 
     it "creates a javascript metric for error" do
-<<<<<<< HEAD
-      params[:type] = "error"
-=======
       params[:type]  = "error"
->>>>>>> b9a6332b0 (metric and spec file updated)
       metric = Metric.create_metric(self, params, user)
 
       expect(metric.valid?).to be true
       expect(metric.metric_type).to eq(Metric::METRIC_TYPES[:error])
     end
 
     it "creates a javascript metric with invalid sent_to" do
-<<<<<<< HEAD
-      metric = Metric.create_metric(self, params.merge(sent_to: "fake"), user)
-=======
       metric = Metric.create_metric(self, params.merge({sent_to: "fake"}), user)
->>>>>>> b9a6332b0 (metric and spec file updated)
 
       expect(metric.valid?).to be false
     end