Resolve conflict in app/models/group.rb

app/models/group.rb

@@ -9,12 +9,9 @@ class Group < Namespace
   include Avatarable
   include Referable
   include SelectForProjectAuthorization
-<<<<<<< HEAD
-  prepend EE::GeoAwareAvatar
-=======
   include LoadedInGroupList
   include GroupDescendant
->>>>>>> upstream/master
+  prepend EE::GeoAwareAvatar
 
   has_many :group_members, -> { where(requested_at: nil) }, dependent: :destroy, as: :source # rubocop:disable Cop/ActiveRecordDependent
   alias_method :members, :group_members