diff --git a/code/datums/components/storage/concrete/implant.dm b/code/datums/components/storage/concrete/implant.dm
index 3a3636e0f6..0348d340ae 100644
--- a/code/datums/components/storage/concrete/implant.dm
+++ b/code/datums/components/storage/concrete/implant.dm
@@ -1,22 +1,3 @@
-<<<<<<< HEAD
-/datum/component/storage/concrete/implant
-	max_w_class = WEIGHT_CLASS_NORMAL
-	max_combined_w_class = 6
-	max_items = 2
-	drop_all_on_destroy = TRUE
-	drop_all_on_deconstruct = TRUE
-	silent = TRUE
-
-/datum/component/storage/concrete/implant/Initialize()
-	. = ..()
-	cant_hold = typecacheof(list(/obj/item/disk/nuclear))
-
-/datum/component/storage/concrete/implant/InheritComponent(datum/component/storage/concrete/implant/I, original)
-	if(!istype(I))
-		return ..()
-	max_combined_w_class += I.max_combined_w_class
-	max_items += I.max_items
-=======
 /datum/component/storage/concrete/implant
 	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 6
@@ -35,4 +16,3 @@
 		return ..()
 	max_combined_w_class += I.max_combined_w_class
 	max_items += I.max_items
->>>>>>> e268d6f... Fix placing boxes in storage implants (#37579)