Fix conflicts

.flayignore

@@ -17,7 +17,6 @@ lib/gitlab/background_migration/*
 app/models/project_services/kubernetes_service.rb
 lib/gitlab/workhorse.rb
 lib/gitlab/ci/trace/chunked_io.rb
-<<<<<<< HEAD
 
 ee/db/**/*
 ee/app/serializers/ee/merge_request_widget_entity.rb
@@ -25,5 +24,3 @@ ee/lib/ee/gitlab/ldap/sync/admin_users.rb
 ee/app/workers/geo/file_download_dispatch_worker/job_artifact_job_finder.rb
 ee/app/workers/geo/file_download_dispatch_worker/lfs_object_job_finder.rb
 ee/spec/**/*
-=======
->>>>>>> upstream/master

app/workers/all_queues.yml

@@ -115,7 +115,6 @@
 - upload_checksum
 - web_hook
 - repository_update_remote_mirror
-<<<<<<< HEAD
 
 # EE-specific queues
 
@@ -176,5 +175,3 @@
 - rebase
 - repository_update_mirror
 - chat_notification
-=======
->>>>>>> upstream/master

spec/lib/gitlab/import_export/all_models.yml

@@ -291,7 +291,6 @@ project:
 - pages_domains
 - authorized_users
 - project_authorizations
-<<<<<<< HEAD
 - mirror_user
 - push_rule
 - jenkins_service
@@ -303,9 +302,6 @@ project:
 - remote_mirrors
 - path_locks
 - approver_groups
-=======
-- remote_mirrors
->>>>>>> upstream/master
 - route
 - redirect_routes
 - statistics

spec/services/ci/retry_build_service_spec.rb

@@ -31,13 +31,8 @@ describe Ci::RetryBuildService do
        commit_id deployments erased_by_id last_deployment project_id
        runner_id tag_taggings taggings tags trigger_request_id
        user_id auto_canceled_by_id retried failure_reason
-<<<<<<< HEAD
        sourced_pipelines artifacts_file_store artifacts_metadata_store
        metadata trace_chunks].freeze # EE
-=======
-       artifacts_file_store artifacts_metadata_store
-       metadata trace_chunks].freeze
->>>>>>> upstream/master
 
   shared_examples 'build duplication' do
     let(:another_pipeline) { create(:ci_empty_pipeline, project: project) }