Fix remaining conflicts in modules

app/models/issue.rb

@@ -32,19 +32,11 @@ class Issue < ActiveRecord::Base
   belongs_to :moved_to, class_name: 'Issue'
 
   has_many :events, as: :target, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
-<<<<<<< HEAD
 
   has_many :merge_requests_closing_issues,
     class_name: 'MergeRequestsClosingIssues',
     dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
 
-=======
-
-  has_many :merge_requests_closing_issues,
-    class_name: 'MergeRequestsClosingIssues',
-    dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
-
->>>>>>> ce/master
   has_many :issue_assignees
   has_many :assignees, class_name: "User", through: :issue_assignees