Properly resolve conflicts in db/schema

db/schema.rb

@@ -2158,7 +2158,6 @@ ActiveRecord::Schema.define(version: 20181126153547) do
     t.index ["shard_id"], name: "index_project_repositories_on_shard_id", using: :btree
   end
 
-<<<<<<< .merge_file_IKjDac
   create_table "project_repository_states", force: :cascade do |t|
     t.integer "project_id", null: false
     t.binary "repository_verification_checksum"
@@ -2175,8 +2174,6 @@ ActiveRecord::Schema.define(version: 20181126153547) do
     t.index ["project_id"], name: "index_project_repository_states_on_project_id", unique: true, using: :btree
   end
 
-=======
->>>>>>> .merge_file_jHBiGC
   create_table "project_statistics", force: :cascade do |t|
     t.integer "project_id", null: false
     t.integer "namespace_id", null: false
@@ -3280,16 +3277,10 @@ ActiveRecord::Schema.define(version: 20181126153547) do
   add_foreign_key "project_features", "projects", name: "fk_18513d9b92", on_delete: :cascade
   add_foreign_key "project_group_links", "projects", name: "fk_daa8cee94c", on_delete: :cascade
   add_foreign_key "project_import_data", "projects", name: "fk_ffb9ee3a10", on_delete: :cascade
-<<<<<<< .merge_file_IKjDac
   add_foreign_key "project_mirror_data", "projects", name: "fk_d1aad367d7", on_delete: :cascade
   add_foreign_key "project_repositories", "projects", on_delete: :cascade
   add_foreign_key "project_repositories", "shards", on_delete: :restrict
   add_foreign_key "project_repository_states", "projects", on_delete: :cascade
-=======
-  add_foreign_key "project_mirror_data", "projects", on_delete: :cascade
-  add_foreign_key "project_repositories", "projects", on_delete: :cascade
-  add_foreign_key "project_repositories", "shards", on_delete: :restrict
->>>>>>> .merge_file_jHBiGC
   add_foreign_key "project_statistics", "projects", on_delete: :cascade
   add_foreign_key "project_tracing_settings", "projects", on_delete: :cascade
   add_foreign_key "projects", "pool_repositories", name: "fk_6e5c14658a", on_delete: :nullify