Resolve schema.rb conflict

db/schema.rb

@@ -11,11 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-<<<<<<< HEAD
-ActiveRecord::Schema.define(version: 20180607154645) do
-=======
 ActiveRecord::Schema.define(version: 20180608201435) do
->>>>>>> upstream/master
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1645,11 +1641,6 @@ ActiveRecord::Schema.define(version: 20180608201435) do
     t.string "merge_jid"
     t.boolean "discussion_locked"
     t.integer "latest_merge_request_diff_id"
-<<<<<<< HEAD
-    t.boolean "allow_collaboration"
-=======
-    t.string "rebase_commit_sha"
->>>>>>> upstream/master
     t.boolean "squash", default: false, null: false
     t.boolean "allow_maintainer_to_push"
   end