Resolve conflicts in MR model spec

spec/models/merge_request_spec.rb

@@ -601,7 +601,6 @@ describe MergeRequest do
     end
   end
 
-<<<<<<< HEAD
   describe "#approvers_left" do
     let(:merge_request) {create :merge_request}
 
@@ -816,14 +815,6 @@ describe MergeRequest do
 
     subject { merge_request }
 
-=======
-  describe '#can_remove_source_branch?' do
-    set(:user) { create(:user) }
-    set(:merge_request) { create(:merge_request, :simple) }
-
-    subject { merge_request }
-
->>>>>>> upstream/master
     before do
       subject.source_project.add_master(user)
     end