Resolve conflicts in app/models/group.rb

app/models/group.rb

@@ -34,13 +34,9 @@ class Group < Namespace
   has_many :variables, class_name: 'Ci::GroupVariable'
   has_many :custom_attributes, class_name: 'GroupCustomAttribute'
 
-<<<<<<< HEAD
   has_many :ldap_group_links, foreign_key: 'group_id', dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
   has_many :hooks, dependent: :destroy, class_name: 'GroupHook' # rubocop:disable Cop/ActiveRecordDependent
-  has_many :uploads, as: :model, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent
 
-=======
->>>>>>> upstream/master
   has_many :boards
 
   # We cannot simply set `has_many :audit_events, as: :entity, dependent: :destroy`