Resolve conflict in spec/serializers/pipeline_serializer_spec.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

spec/serializers/pipeline_serializer_spec.rb

@@ -117,12 +117,8 @@ describe PipelineSerializer do
       shared_examples 'no N+1 queries' do
         it 'verifies number of queries', :request_store do
           recorded = ActiveRecord::QueryRecorder.new { subject }
-<<<<<<< HEAD
 
           expect(recorded.count).to be_within(1).of(40)
-=======
-          expect(recorded.count).to be_within(1).of(36)
->>>>>>> upstream/master
           expect(recorded.cached_count).to eq(0)
         end
       end