Resolve conflicts in `20180726172057_create_resource_label_events.rb`

db/migrate/20180726172057_create_resource_label_events.rb

@@ -10,10 +10,7 @@ class CreateResourceLabelEvents < ActiveRecord::Migration
       t.integer :action, null: false
       t.references :issue, null: true, index: true, foreign_key: { on_delete: :cascade }
       t.references :merge_request, null: true, index: true, foreign_key: { on_delete: :cascade }
-<<<<<<< HEAD
       t.references :epic, null: true, index: true, foreign_key: { on_delete: :cascade }
-=======
->>>>>>> upstream/master
       t.references :label, index: true, foreign_key: { on_delete: :nullify }
       t.references :user, index: true, foreign_key: { on_delete: :nullify }
       t.datetime_with_timezone :created_at, null: false