Resolve a few conflicts

app/controllers/admin/logs_controller.rb

 class Admin::LogsController < Admin::ApplicationController
-<<<<<<< HEAD
   prepend EE::Admin::LogsController
 
-=======
->>>>>>> upstream/master
   before_action :loggers
 
   def show

app/controllers/boards/issues_controller.rb

 module Boards
   class IssuesController < Boards::ApplicationController
-<<<<<<< HEAD
     prepend EE::BoardsResponses
     prepend EE::Boards::IssuesController
-=======
->>>>>>> upstream/master
     include BoardsResponses
 
     before_action :authorize_read_issue, only: [:index]
@@ -15,11 +12,7 @@ module Boards
     def index
       issues = Boards::Issues::ListService.new(board_parent, current_user, filter_params).execute
       issues = issues.page(params[:page]).per(params[:per] || 20)
-<<<<<<< HEAD
       make_sure_position_is_set(issues) unless Gitlab::Geo.secondary?
-=======
-      make_sure_position_is_set(issues)
->>>>>>> upstream/master
 
       render json: {
         issues: serialize_as_json(issues.preload(:project)),

app/models/member.rb

@@ -127,14 +127,9 @@ class Member < ActiveRecord::Base
       find_by(invite_token: invite_token)
     end
 
-<<<<<<< HEAD
-    def add_user(source, user, access_level, current_user: nil, expires_at: nil, ldap: false)
-      user = retrieve_user(user)
-=======
-    def add_user(source, user, access_level, existing_members: nil, current_user: nil, expires_at: nil)
+    def add_user(source, user, access_level, existing_members: nil, current_user: nil, expires_at: nil, ldap: false)
       # `user` can be either a User object, User ID or an email to be invited
       member = retrieve_member(source, user, existing_members)
->>>>>>> upstream/master
       access_level = retrieve_access_level(access_level)
 
       return member unless can_update_member?(current_user, member)