diff --git a/app/services/groups/destroy_service.rb b/app/services/groups/destroy_service.rb
index b5d11860f5f0f3ed729e225b16878d34bc2225a4..b00384ee2b84baf4c2b61b252ac114fb32f2e187 100644
--- a/app/services/groups/destroy_service.rb
+++ b/app/services/groups/destroy_service.rb
@@ -2,11 +2,8 @@
 
 module Groups
   class DestroyService < Groups::BaseService
-<<<<<<< HEAD
     prepend ::EE::Groups::DestroyService
 
-=======
->>>>>>> upstream/master
     DestroyError = Class.new(StandardError)
 
     def async_execute