Resolved conflicts in app/services/protected_branches/* from prepend EE::

app/services/protected_branches/access_level_params.rb

 module ProtectedBranches
   class AccessLevelParams
-<<<<<<< HEAD
     prepend EE::ProtectedBranches::AccessLevelParams
 
-=======
->>>>>>> upstream/master
     attr_reader :type, :params
 
     def initialize(type, params)

app/services/protected_branches/api_service.rb

 module ProtectedBranches
   class ApiService < BaseService
-<<<<<<< HEAD
     prepend EE::ProtectedBranches::ApiService
 
-=======
->>>>>>> upstream/master
     def create
       @push_params = AccessLevelParams.new(:push, params)
       @merge_params = AccessLevelParams.new(:merge, params)