Resolve conflicts

app/models/concerns/protected_branch_access.rb

@@ -3,10 +3,8 @@
 module ProtectedBranchAccess
   extend ActiveSupport::Concern
   include ProtectedRefAccess
-<<<<<<< HEAD
+
   include EE::ProtectedRefAccess # Can't use prepend. It'll override wrongly
-=======
->>>>>>> upstream/master
 
   included do
     belongs_to :protected_branch

app/models/concerns/protected_tag_access.rb

@@ -3,10 +3,8 @@
 module ProtectedTagAccess
   extend ActiveSupport::Concern
   include ProtectedRefAccess
-<<<<<<< HEAD
+
   include EE::ProtectedRefAccess # Can't use prepend. It'll override wrongly
-=======
->>>>>>> upstream/master
 
   included do
     belongs_to :protected_tag

spec/support/helpers/stub_configuration.rb

@@ -3,10 +3,8 @@ require 'active_support/hash_with_indifferent_access'
 require 'active_support/dependencies'
 
 require_dependency 'gitlab'
-<<<<<<< HEAD
+
 require_dependency Gitlab.root.join('ee/spec/support/helpers/ee/stub_configuration')
-=======
->>>>>>> upstream/master
 
 module StubConfiguration
   prepend EE::StubConfiguration