more save points

code/modules/mob/living/carbon/monkey/combat.dm

@@ -122,11 +122,7 @@
 	if(L == src)
 		return FALSE
 
-<<<<<<< HEAD
-	if(disabilities & PACIFISM)
-=======
 	if(has_disability(DISABILITY_PACIFISM))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return FALSE
 
 	if(enemies[L])

code/modules/mob/living/carbon/monkey/update_icons.dm

@@ -19,11 +19,7 @@
 	if(!HD) //Decapitated
 		return
 
-<<<<<<< HEAD
-	if(disabilities & HUSK)
-=======
 	if(has_disability(DISABILITY_HUSK))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		return
 
 	var/hair_hidden = 0