More conflicts resolving

lib/gitlab/git_access.rb

@@ -52,11 +52,7 @@ module Gitlab
     def download_access_check
       if user
         user_download_access_check
-<<<<<<< HEAD
-      elsif deploy_key.nil? && geo_node_key.nil? && !Guest.can?(:download_code, project)
-=======
-      elsif deploy_key.nil? && !guest_can_downlod_code?
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
+      elsif deploy_key.nil? && geo_node_key.nil? && !guest_can_downlod_code?
         raise UnauthorizedError, ERROR_MESSAGES[:download]
       end
     end

spec/services/merge_requests/merge_service_spec.rb

@@ -35,7 +35,6 @@ describe MergeRequests::MergeService, services: true do
       it 'creates system note about merge_request merge' do
         note = merge_request.notes.last
         expect(note.note).to include 'merged'
-<<<<<<< HEAD
       end
     end
 
@@ -52,8 +51,6 @@ describe MergeRequests::MergeService, services: true do
 
       it 'returns the correct error message' do
         expect(merge_request.merge_error).to include('This merge request cannot be merged')
-=======
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
       end
     end
 

spec/services/merge_requests/refresh_service_spec.rb

@@ -91,10 +91,7 @@ describe MergeRequests::RefreshService, services: true do
       it { expect(@merge_request.approvals).not_to be_empty }
       it { expect(@fork_merge_request).to be_merged }
       it { expect(@fork_merge_request.notes.last.note).to include('merged') }
-<<<<<<< HEAD
       it { expect(@fork_merge_request.approvals).not_to be_empty }
-=======
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
       it { expect(@build_failed_todo).to be_done }
       it { expect(@fork_build_failed_todo).to be_done }
     end
@@ -134,10 +131,7 @@ describe MergeRequests::RefreshService, services: true do
 
       it { expect(@merge_request.notes).to be_empty }
       it { expect(@merge_request).to be_open }
-<<<<<<< HEAD
       it { expect(@merge_request.approvals).not_to be_empty }
-=======
->>>>>>> 14046b9c734e5e6506d63276f39f3f9d770c3699
       it { expect(@fork_merge_request.notes.last.note).to include('added 28 commits') }
       it { expect(@fork_merge_request).to be_open }
       it { expect(@build_failed_todo).to be_pending }