save point - a lot of shit to fix

code/game/objects/items/handcuffs.dm

@@ -26,11 +26,7 @@
 /obj/item/restraints/handcuffs/attack(mob/living/carbon/C, mob/living/carbon/human/user)
 	if(!istype(C))
 		return
-<<<<<<< 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'>Uh... how do those things work?!</span>")
 		apply_cuffs(user,user)
 		return
@@ -383,4 +379,4 @@
 		B.Crossed(hit_atom)
 		qdel(src)
 	..()
-	
+