Resolving conflict in spec/requests/api/jobs_spec.rb

spec/requests/api/jobs_spec.rb

@@ -453,7 +453,6 @@ describe API::Jobs do
     end
 
     context 'authorized user' do
-<<<<<<< HEAD
       context 'when trace is in ObjectStorage' do
         let!(:job) { create(:ci_build, :trace_artifact, pipeline: pipeline) }
 
@@ -470,8 +469,6 @@ describe API::Jobs do
         end
       end
 
-=======
->>>>>>> upstream/master
       context 'when trace is artifact' do
         let(:job) { create(:ci_build, :trace_artifact, pipeline: pipeline) }