Resolving conflict with db/schema.rb

db/schema.rb

@@ -177,10 +177,11 @@ ActiveRecord::Schema.define(version: 20180206200543) do
     t.integer "gitaly_timeout_default", default: 55, null: false
     t.integer "gitaly_timeout_medium", default: 30, null: false
     t.integer "gitaly_timeout_fast", default: 10, null: false
-<<<<<<< HEAD
     t.boolean "mirror_available", default: true, null: false
     t.string "auto_devops_domain"
     t.integer "default_project_creation", default: 2, null: false
+    t.boolean "authorized_keys_enabled", default: true, null: false
+    t.string "auto_devops_domain"
   end
 
   create_table "approvals", force: :cascade do |t|
@@ -188,10 +189,6 @@ ActiveRecord::Schema.define(version: 20180206200543) do
     t.integer "user_id", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-=======
-    t.boolean "authorized_keys_enabled", default: true, null: false
-    t.string "auto_devops_domain"
->>>>>>> upstream/master
   end
 
   add_index "approvals", ["merge_request_id"], name: "index_approvals_on_merge_request_id", using: :btree
@@ -1308,7 +1305,6 @@ ActiveRecord::Schema.define(version: 20180206200543) do
   add_index "labels", ["title"], name: "index_labels_on_title", using: :btree
   add_index "labels", ["type", "project_id"], name: "index_labels_on_type_and_project_id", using: :btree
 
-<<<<<<< HEAD
   create_table "ldap_group_links", force: :cascade do |t|
     t.string "cn"
     t.integer "group_access", null: false
@@ -1319,8 +1315,6 @@ ActiveRecord::Schema.define(version: 20180206200543) do
     t.string "filter"
   end
 
-=======
->>>>>>> upstream/master
   create_table "lfs_file_locks", force: :cascade do |t|
     t.integer "project_id", null: false
     t.integer "user_id", null: false