Fix conflicts in issue models

app/models/issue.rb

@@ -201,7 +201,6 @@ class Issue < ActiveRecord::Base
     branches_with_iid - branches_with_merge_request
   end
 
-<<<<<<< HEAD
   def related_issues(current_user, preload: nil)
     related_issues = Issue
                        .select(['issues.*', 'issue_links.id AS issue_link_id'])
@@ -219,8 +218,6 @@ class Issue < ActiveRecord::Base
     )
   end
 
-=======
->>>>>>> upstream/master
   def suggested_branch_name
     return to_branch_name unless project.repository.branch_exists?(to_branch_name)
 

spec/models/issue_spec.rb

@@ -376,7 +376,6 @@ describe Issue do
     end
   end
 
-<<<<<<< HEAD
   describe '#related_issues' do
     let(:user) { create(:user) }
     let(:authorized_project) { create(:project) }
@@ -414,8 +413,6 @@ describe Issue do
     end
   end
 
-=======
->>>>>>> upstream/master
   describe '#suggested_branch_name' do
     let(:repository) { double }