Resolving conflict group_spec.rb

spec/models/group_spec.rb

@@ -18,10 +18,7 @@ describe Group do
     it { is_expected.to have_many(:uploads).dependent(:destroy) }
     it { is_expected.to have_one(:chat_team) }
     it { is_expected.to have_many(:custom_attributes).class_name('GroupCustomAttribute') }
-<<<<<<< HEAD
     it { is_expected.to have_many(:audit_events).dependent(false) }
-=======
->>>>>>> upstream/master
     it { is_expected.to have_many(:badges).class_name('GroupBadge') }
 
     describe '#members & #requesters' do