Resolve merge conflicts

app/models/ci/job_artifact.rb

@@ -18,10 +18,7 @@ module Ci
     after_save :update_file_store
 
     scope :with_files_stored_locally, -> { where(file_store: [nil, ::JobArtifactUploader::Store::LOCAL]) }
-<<<<<<< HEAD
     scope :with_files_stored_remotely, -> { where(file_store: ::JobArtifactUploader::Store::REMOTE) }
-=======
->>>>>>> upstream/master
 
     delegate :exists?, :open, to: :file
 

app/models/project_statistics.rb

@@ -6,13 +6,10 @@ class ProjectStatistics < ActiveRecord::Base
 
   COLUMNS_TO_REFRESH = [:repository_size, :lfs_objects_size, :commit_count].freeze
   INCREMENTABLE_COLUMNS = [:build_artifacts_size].freeze
-<<<<<<< HEAD
 
   def shared_runners_minutes
     shared_runners_seconds.to_i / 60
   end
-=======
->>>>>>> upstream/master
 
   def total_repository_size
     repository_size + lfs_objects_size

spec/models/ci/build_spec.rb

@@ -1414,7 +1414,6 @@ describe Ci::Build do
       expect { build.save! }
         .to change { build.project.statistics.reload.build_artifacts_size }
         .by(19)
-<<<<<<< HEAD
     end
 
     context 'when the artifact size stays the same' do
@@ -1425,8 +1424,6 @@ describe Ci::Build do
 
         build.save!
       end
-=======
->>>>>>> upstream/master
     end
   end