diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 32b5284b3f..fdf454b514 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -362,11 +362,7 @@
 
 		add_logs(src, M, "grabbed", addition="passive grab")
 		if(!supress_message)
-<<<<<<< HEAD
-			visible_message("<span class='warning'>[src] has grabbed [M] passively!</span>")
-=======
 			visible_message("<span class='warning'>[src] has grabbed [M][(zone_selected == "l_arm" || zone_selected == "r_arm")? " by their hands":" passively"]!</span>")
->>>>>>> af87ed3... grammar
 		if(!iscarbon(src))
 			M.LAssailant = null
 		else