more save points

code/modules/surgery/organs/ears.dm

@@ -25,11 +25,7 @@
 		return
 	var/mob/living/carbon/C = owner
 	// genetic deafness prevents the body from using the ears, even if healthy
-<<<<<<< HEAD
-	if(C.disabilities & DEAF)
-=======
 	if(C.has_disability(DISABILITY_DEAF))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		deaf = max(deaf, 1)
 	else
 		if(C.ears && (C.ears.flags_2 & HEALS_EARS_2))
@@ -46,11 +42,7 @@
 
 	var/mob/living/carbon/C = owner
 
-<<<<<<< HEAD
-	if(iscarbon(owner) && C.disabilities & DEAF)
-=======
 	if(iscarbon(owner) && C.has_disability(DISABILITY_DEAF))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		deaf = 1
 
 /obj/item/organ/ears/proc/adjustEarDamage(ddmg, ddeaf)