save point - a lot of shit to fix

code/game/objects/items/melee/misc.dm

@@ -99,11 +99,7 @@
 		return ..()
 
 	add_fingerprint(user)
-<<<<<<< HEAD
-	if((CLUMSY in user.disabilities) && prob(50))
-=======
 	if((user.has_disability(DISABILITY_CLUMSY)) && prob(50))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(user, "<span class ='danger'>You club yourself over the head.</span>")
 		user.Knockdown(60 * force)
 		if(ishuman(user))

code/game/objects/items/melee/transforming.dm

@@ -72,10 +72,6 @@
 		to_chat(user, "<span class='notice'>[src] [active ? "is now active":"can now be concealed"].</span>")
 
 /obj/item/melee/transforming/proc/clumsy_transform_effect(mob/living/user)
-<<<<<<< HEAD
-	if(user.disabilities & CLUMSY && prob(50))
-=======
 	if(user.has_disability(DISABILITY_CLUMSY) && prob(50))
->>>>>>> bc20a75... Merge pull request #33783 from Cruix/fix_blind
 		to_chat(user, "<span class='warning'>You accidentally cut yourself with [src], like a doofus!</span>")
 		user.take_bodypart_damage(5,5)