Resolve all_queues.yml and sidekiq_config.rb

app/workers/all_queues.yml

@@ -96,7 +96,6 @@
 - update_user_activity
 - upload_checksum
 - web_hook
-<<<<<<< HEAD
 
 # EE-specific queues
 - cronjob:clear_shared_runners_minutes
@@ -131,5 +130,3 @@
 - rebase
 - repository_update_mirror
 - repository_update_remote_mirror
-=======
->>>>>>> upstream/master

lib/gitlab/sidekiq_config.rb

@@ -39,13 +39,9 @@ module Gitlab
     end
 
     def self.workers
-<<<<<<< HEAD
       @workers ||=
         find_workers(Rails.root.join('app', 'workers')) +
         find_workers(Rails.root.join('ee', 'app', 'workers'))
-=======
-      @workers ||= find_workers(Rails.root.join('app', 'workers'))
->>>>>>> upstream/master
     end
 
     def self.find_workers(root)