Resolve conflicts in db/schema.rb

db/schema.rb

@@ -1253,7 +1253,6 @@ ActiveRecord::Schema.define(version: 20180419031622) do
 
   add_index "identities", ["user_id"], name: "index_identities_on_user_id", using: :btree
 
-<<<<<<< HEAD
   create_table "index_statuses", force: :cascade do |t|
     t.integer "project_id", null: false
     t.datetime "indexed_at"
@@ -1265,8 +1264,6 @@ ActiveRecord::Schema.define(version: 20180419031622) do
 
   add_index "index_statuses", ["project_id"], name: "index_index_statuses_on_project_id", unique: true, using: :btree
 
-=======
->>>>>>> upstream/master
   create_table "internal_ids", id: :bigserial, force: :cascade do |t|
     t.integer "project_id"
     t.integer "usage", null: false
@@ -2758,10 +2755,7 @@ ActiveRecord::Schema.define(version: 20180419031622) do
   add_foreign_key "gpg_signatures", "gpg_keys", on_delete: :nullify
   add_foreign_key "gpg_signatures", "projects", on_delete: :cascade
   add_foreign_key "group_custom_attributes", "namespaces", column: "group_id", on_delete: :cascade
-<<<<<<< HEAD
   add_foreign_key "index_statuses", "projects", name: "fk_74b2492545", on_delete: :cascade
-=======
->>>>>>> upstream/master
   add_foreign_key "internal_ids", "namespaces", name: "fk_162941d509", on_delete: :cascade
   add_foreign_key "internal_ids", "projects", on_delete: :cascade
   add_foreign_key "issue_assignees", "issues", name: "fk_b7d881734a", on_delete: :cascade