Resolve prepend related conflicts

app/controllers/application_controller.rb

@@ -123,15 +123,11 @@ class ApplicationController < ActionController::Base
   end
 
   def after_sign_out_path_for(resource)
-<<<<<<< HEAD
     if Gitlab::Geo.secondary?
       Gitlab::Geo.primary_node.oauth_logout_url(@geo_logout_state)
     else
       Gitlab::CurrentSettings.after_sign_out_path.presence || new_user_session_path
     end
-=======
-    Gitlab::CurrentSettings.after_sign_out_path.presence || new_user_session_path
->>>>>>> upstream/master
   end
 
   def can?(object, action, subject = :global)

app/helpers/projects_helper.rb

 module ProjectsHelper
-<<<<<<< HEAD
   prepend ::EE::ProjectsHelper
 
-=======
->>>>>>> upstream/master
   def link_to_project(project)
     link_to [project.namespace.becomes(Namespace), project], title: h(project.name) do
       title = content_tag(:span, project.name, class: 'project-name')

app/models/note.rb

@@ -3,11 +3,8 @@
 # A note of this type is never resolvable.
 class Note < ActiveRecord::Base
   extend ActiveModel::Naming
-<<<<<<< HEAD
   prepend EE::Note
 
-=======
->>>>>>> upstream/master
   include Participable
   include Mentionable
   include Elastic::NotesSearch

app/models/protected_branch.rb

 class ProtectedBranch < ActiveRecord::Base
   include Gitlab::ShellAdapter
   include ProtectedRef
-<<<<<<< HEAD
   prepend EE::ProtectedRef
-=======
->>>>>>> upstream/master
 
   protected_ref_access_levels :merge, :push
 

app/services/ci/register_job_service.rb

@@ -2,11 +2,8 @@ module Ci
   # This class responsible for assigning
   # proper pending build to runner on runner API request
   class RegisterJobService
-<<<<<<< HEAD
     prepend EE::Ci::RegisterJobService
 
-=======
->>>>>>> upstream/master
     attr_reader :runner
 
     Result = Struct.new(:build, :valid?)

app/services/users/build_service.rb

 module Users
   class BuildService < BaseService
-<<<<<<< HEAD
     prepend ::EE::Users::BuildService
 
-=======
->>>>>>> upstream/master
     def initialize(current_user, params = {})
       @current_user = current_user
       @params = params.dup

lib/api/helpers/runner.rb

 module API
   module Helpers
     module Runner
-<<<<<<< HEAD
       prepend EE::API::Helpers::Runner
 
-=======
->>>>>>> upstream/master
       JOB_TOKEN_HEADER = 'HTTP_JOB_TOKEN'.freeze
       JOB_TOKEN_PARAM = :token
       UPDATE_RUNNER_EVERY = 10 * 60

lib/gitlab/auth.rb

@@ -14,11 +14,8 @@ module Gitlab
     DEFAULT_SCOPES = [:api].freeze
 
     class << self
-<<<<<<< HEAD
       prepend EE::Gitlab::Auth
 
-=======
->>>>>>> upstream/master
       def find_for_git_client(login, password, project:, ip:)
         raise "Must provide an IP for rate limiting" if ip.nil?