Resolve CI/CD build related merge conflicts

app/workers/build_finished_worker.rb

@@ -6,11 +6,8 @@ class BuildFinishedWorker
 
   def perform(build_id)
     Ci::Build.find_by(id: build_id).try do |build|
-<<<<<<< HEAD
       UpdateBuildMinutesService.new(build.project, nil).execute(build)
-=======
       BuildTraceSectionsWorker.perform_async(build.id)
->>>>>>> ce-com/master
       BuildCoverageWorker.new.perform(build.id)
       BuildHooksWorker.new.perform(build.id)
     end

spec/models/ci/build_spec.rb

@@ -18,11 +18,8 @@ describe Ci::Build do
   it { is_expected.to belong_to(:trigger_request) }
   it { is_expected.to belong_to(:erased_by) }
   it { is_expected.to have_many(:deployments) }
-<<<<<<< HEAD
   it { is_expected.to have_many(:sourced_pipelines) }
-=======
   it { is_expected.to have_many(:trace_sections)}
->>>>>>> ce-com/master
   it { is_expected.to validate_presence_of(:ref) }
   it { is_expected.to respond_to(:has_trace?) }
   it { is_expected.to respond_to(:trace) }