diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm
index 4df1d847be..b5081370f0 100644
--- a/code/modules/surgery/limb_augmentation.dm
+++ b/code/modules/surgery/limb_augmentation.dm
@@ -1,65 +1,3 @@
-<<<<<<< HEAD
-
-/////AUGMENTATION SURGERIES//////
-
-
-//SURGERY STEPS
-
-/datum/surgery_step/replace
-	name = "sever muscles"
-	implements = list(/obj/item/scalpel = 100, /obj/item/wirecutters = 55)
-	time = 32
-
-
-/datum/surgery_step/replace/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
-	user.visible_message("[user] begins to sever the muscles on [target]'s [parse_zone(user.zone_selected)].", "<span class ='notice'>You begin to sever the muscles on [target]'s [parse_zone(user.zone_selected)]...</span>")
-
-
-/datum/surgery_step/add_limb
-	name = "replace limb"
-	implements = list(/obj/item/bodypart = 100)
-	time = 32
-	var/obj/item/bodypart/L = null // L because "limb"
-
-
-/datum/surgery_step/add_limb/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
-	var/obj/item/bodypart/aug = tool
-	if(aug.status != BODYPART_ROBOTIC)
-		to_chat(user, "<span class='warning'>that's not an augment silly!</span>")
-		return -1
-	if(aug.body_zone != target_zone)
-		to_chat(user, "<span class='warning'>[tool] isn't the right type for [parse_zone(target_zone)].</span>")
-		return -1
-	L = surgery.operated_bodypart
-	if(L)
-		user.visible_message("[user] begins to augment [target]'s [parse_zone(user.zone_selected)].", "<span class ='notice'>You begin to augment [target]'s [parse_zone(user.zone_selected)]...</span>")
-	else
-		user.visible_message("[user] looks for [target]'s [parse_zone(user.zone_selected)].", "<span class ='notice'>You look for [target]'s [parse_zone(user.zone_selected)]...</span>")
-
-
-//ACTUAL SURGERIES
-
-/datum/surgery/augmentation
-	name = "augmentation"
-	steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/replace, /datum/surgery_step/saw, /datum/surgery_step/add_limb)
-	species = list(/mob/living/carbon/human)
-	possible_locs = list("r_arm","l_arm","r_leg","l_leg","chest","head")
-	requires_real_bodypart = TRUE
-
-//SURGERY STEP SUCCESSES
-
-/datum/surgery_step/add_limb/success(mob/user, mob/living/carbon/target, target_zone, obj/item/bodypart/tool, datum/surgery/surgery)
-	if(L)
-		user.visible_message("[user] successfully augments [target]'s [parse_zone(target_zone)]!", "<span class='notice'>You successfully augment [target]'s [parse_zone(target_zone)].</span>")
-		L.change_bodypart_status(BODYPART_ROBOTIC, TRUE)
-		L.icon = tool.icon
-		L.max_damage = tool.max_damage
-		user.drop_item()
-		qdel(tool)
-		target.update_body_parts()
-		target.updatehealth()
-=======
-
 /////AUGMENTATION SURGERIES//////
 
 
@@ -117,9 +55,8 @@
 		qdel(tool)
 		target.update_body_parts()
 		target.updatehealth()
->>>>>>> b6d349e... Remove drop_item, drop_item_v, put_in_hands_or_del (#31386)
 		target.update_hair()
-		add_logs(user, target, "augmented", addition="by giving him new [parse_zone(target_zone)] INTENT: [uppertext(user.a_intent)]")
-	else
-		to_chat(user, "<span class='warning'>[target] has no organic [parse_zone(target_zone)] there!</span>")
-	return 1
+		add_logs(user, target, "augmented", addition="by giving him new [parse_zone(target_zone)] INTENT: [uppertext(user.a_intent)]")
+	else
+		to_chat(user, "<span class='warning'>[target] has no organic [parse_zone(target_zone)] there!</span>")
+	return 1