Resolve conflict in spec/serializers/pipeline_serializer_spec.rb

spec/serializers/pipeline_serializer_spec.rb

@@ -113,11 +113,7 @@ describe PipelineSerializer do
 
       it "verifies number of queries" do
         recorded = ActiveRecord::QueryRecorder.new { subject }
-<<<<<<< HEAD
         expect(recorded.count).to be_within(1).of(64)
-=======
-        expect(recorded.count).to be_within(1).of(60)
->>>>>>> ce/master
         expect(recorded.cached_count).to eq(0)
       end