diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 38c1ab260a..39f1339d94 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -732,11 +732,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 
 	for(var/datum/wound/W in wounds)
 		// wounds can disappear after 10 minutes at the earliest
-<<<<<<< HEAD
-		if(W.damage <= 0 && W.created + 10 * 10 * 60 <= world.time)
-=======
 		if(W.damage <= 0 && W.created + 10 MINUTES <= world.time)
->>>>>>> e1ed0044bb... Merge pull request #13698 from Heroman3003/woundfix
 			wounds -= W
 			continue
 			// let the GC handle the deletion of the wound