diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm
index 37a1aa11883..67c429e8337 100644
--- a/code/modules/mob/living/carbon/human/species/species.dm
+++ b/code/modules/mob/living/carbon/human/species/species.dm
@@ -481,8 +481,4 @@
 	amount *= 1 - H.get_water_protection()
 	amount *= water_damage_mod
 	if(amount > 0)
-<<<<<<< HEAD
 		H.adjustToxLoss(amount)
-=======
-		H.adjustToxLoss(amount)
->>>>>>> b2c5524... Merge pull request #6648 from Mechoid/OhMyGodMechoid