Fix lib/gitlab/git_access.rb conflict

lib/gitlab/git_access.rb

@@ -2,12 +2,9 @@
 # class return an instance of `GitlabAccessStatus`
 module Gitlab
   class GitAccess
-<<<<<<< HEAD
     prepend ::EE::Gitlab::GitAccess
     include ActionView::Helpers::SanitizeHelper
     include PathLocksHelper
-=======
->>>>>>> upstream/master
     include Gitlab::Utils::StrongMemoize
 
     UnauthorizedError = Class.new(StandardError)
@@ -237,7 +234,6 @@ module Gitlab
       end
 
       return if changes.blank? # Allow access this is needed for EE.
-<<<<<<< HEAD
 
       if project.above_size_limit?
         raise UnauthorizedError, Gitlab::RepositorySizeError.new(project).push_error
@@ -251,12 +247,6 @@ module Gitlab
       check_change_access!(changes)
     end
 
-=======
-
-      check_change_access!(changes)
-    end
-
->>>>>>> upstream/master
     def check_change_access!(changes)
       changes_list = Gitlab::ChangesList.new(changes)