Fix conflicts in config/, db/ and rubocop/

config/sidekiq_queues.yml

@@ -54,7 +54,7 @@
   - [system_hook_push, 1]
   - [update_user_activity, 1]
   - [propagate_service_template, 1]
-<<<<<<< HEAD
+  - [background_migration, 1]
   # EE specific queues
   - [ldap_group_sync, 2]
   - [geo, 1]
@@ -66,6 +66,3 @@
   - [elastic_indexer, 1]
   - [elastic_commit_indexer, 1]
   - [export_csv, 1]
-=======
-  - [background_migration, 1]
->>>>>>> ce/master

db/schema.rb

@@ -137,16 +137,13 @@ ActiveRecord::Schema.define(version: 20170606202615) do
     t.boolean "clientside_sentry_enabled", default: false, null: false
     t.string "clientside_sentry_dsn"
     t.boolean "prometheus_metrics_enabled", default: false, null: false
-<<<<<<< HEAD
     t.boolean "check_namespace_plan", default: false, null: false
     t.integer "mirror_max_delay", default: 5, null: false
     t.integer "mirror_max_capacity", default: 100, null: false
     t.integer "mirror_capacity_threshold", default: 50, null: false
     t.boolean "authorized_keys_enabled"
-=======
     t.boolean "help_page_hide_commercial_content", default: false
     t.string "help_page_support_url"
->>>>>>> ce/master
   end
 
   create_table "approvals", force: :cascade do |t|

rubocop/cop/rspec/single_line_hook.rb

-<<<<<<< HEAD
-=======
 require 'rubocop-rspec'
 
->>>>>>> ce/master
 module RuboCop
   module Cop
     module RSpec
@@ -22,11 +19,7 @@ module RuboCop
       #   after(:each) do
       #     undo_something
       #   end
-<<<<<<< HEAD
-      class SingleLineHook < RuboCop::Cop::RSpec::Cop
-=======
       class SingleLineHook < Cop
->>>>>>> ce/master
         MESSAGE = "Don't use single-line hook blocks.".freeze
 
         def_node_search :rspec_hook?, <<~PATTERN