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