more save points

code/modules/projectiles/gun.dm

@@ -158,11 +158,7 @@
 	//Exclude lasertag guns from the DISABILITY_CLUMSY check.
 	if(clumsy_check)
 		if(istype(user))
-<<<<<<< HEAD
-			if (user.disabilities & CLUMSY && prob(40))
-=======
 			if (user.has_disability(DISABILITY_CLUMSY) && prob(40))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 				to_chat(user, "<span class='userdanger'>You shoot yourself in the foot with [src]!</span>")
 				var/shot_leg = pick("l_leg", "r_leg")
 				process_fire(user,user,0,params, zone_override = shot_leg)