Resolve conflict on db/schema.rb

db/schema.rb

@@ -1991,13 +1991,10 @@ ActiveRecord::Schema.define(version: 20180320182229) do
     t.boolean "only_mirror_protected_branches"
     t.boolean "pull_mirror_available_overridden"
     t.integer "jobs_cache_index"
-<<<<<<< HEAD
     t.boolean "mirror_overwrites_diverged_branches"
     t.string "external_authorization_classification_label"
     t.string "external_webhook_token"
-=======
     t.boolean "pages_https_only", default: true
->>>>>>> upstream/master
   end
 
   add_index "projects", ["ci_id"], name: "index_projects_on_ci_id", using: :btree