diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index 3e7c683af2..1d7dd6d57a 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -430,8 +430,4 @@
 		else
 			user.visible_message("\The [user] stops applying pressure to [src]'s [organ.name]!", "You stop applying pressure to [src]'s [organ.name]!")
 
-<<<<<<< HEAD
 	return TRUE 
-=======
-	return TRUE
->>>>>>> 49a8e3b... Merge pull request #6428 from Screemonster/icastfist