Resolve conflicts in User model by moving to EE module

app/models/ee/user.rb

@@ -18,6 +18,15 @@ module EE
 
       delegate :shared_runners_minutes_limit, :shared_runners_minutes_limit=,
                to: :namespace
+
+      has_many :path_locks,               dependent: :destroy # rubocop: disable Cop/ActiveRecordDependent
+
+      has_many :approvals,                dependent: :destroy # rubocop: disable Cop/ActiveRecordDependent
+      has_many :approvers,                dependent: :destroy # rubocop: disable Cop/ActiveRecordDependent
+
+      # Protected Branch Access
+      has_many :protected_branch_merge_access_levels, dependent: :destroy, class_name: ProtectedBranch::MergeAccessLevel # rubocop:disable Cop/ActiveRecordDependent
+      has_many :protected_branch_push_access_levels, dependent: :destroy, class_name: ProtectedBranch::PushAccessLevel # rubocop:disable Cop/ActiveRecordDependent
     end
 
     module ClassMethods

app/models/user.rb

@@ -119,17 +119,6 @@ class User < ActiveRecord::Base
   has_many :todos,                    dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
   has_many :notification_settings,    dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
   has_many :award_emoji,              dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
-<<<<<<< HEAD
-  has_many :path_locks,               dependent: :destroy # rubocop: disable Cop/ActiveRecordDependent
-
-  has_many :approvals,                dependent: :destroy # rubocop: disable Cop/ActiveRecordDependent
-  has_many :approvers,                dependent: :destroy # rubocop: disable Cop/ActiveRecordDependent
-
-  # Protected Branch Access
-  has_many :protected_branch_merge_access_levels, dependent: :destroy, class_name: ProtectedBranch::MergeAccessLevel # rubocop:disable Cop/ActiveRecordDependent
-  has_many :protected_branch_push_access_levels, dependent: :destroy, class_name: ProtectedBranch::PushAccessLevel # rubocop:disable Cop/ActiveRecordDependent
-=======
->>>>>>> ce/master
   has_many :triggers,                 dependent: :destroy, class_name: 'Ci::Trigger', foreign_key: :owner_id # rubocop:disable Cop/ActiveRecordDependent
 
   has_many :issue_assignees