diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index d330ec1ba7..b6a4c46fcd 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -126,14 +126,10 @@
 
 /mob/living/proc/handle_weakened()
 	if(weakened)
-<<<<<<< HEAD
-		weakened = max(weakened-1,0)
+		AdjustWeakened(-1)
 		throw_alert("weakened", /obj/screen/alert/weakened)
 	else
 		clear_alert("weakened")
-=======
-		AdjustWeakened(-1)
->>>>>>> 55b2c8d... Merge pull request #7354 from Neerti/status_indicators
 	return weakened
 
 /mob/living/proc/handle_stuttering()