diff --git a/code/datums/components/storage/concrete/rped.dm b/code/datums/components/storage/concrete/rped.dm
index 10541f55c2..eb895fd74f 100644
--- a/code/datums/components/storage/concrete/rped.dm
+++ b/code/datums/components/storage/concrete/rped.dm
@@ -1,36 +1,3 @@
-<<<<<<< HEAD
-/datum/component/storage/concrete/rped
-	collection_mode = COLLECT_EVERYTHING
-	allow_quick_gather = TRUE
-	allow_quick_empty = TRUE
-	click_gather = TRUE
-	max_w_class = WEIGHT_CLASS_NORMAL
-	max_combined_w_class = 100
-	max_items = 50
-	display_numerical_stacking = TRUE
-
-/datum/component/storage/concrete/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
-	. = ..()
-	if(!I.get_part_rating() && !stop_messages)
-		to_chat(M, "<span class='warning'>[parent] only accepts machine parts!</span>")
-		return FALSE
-
-/datum/component/storage/concrete/bluespace/rped
-	collection_mode = COLLECT_EVERYTHING
-	allow_quick_gather = TRUE
-	allow_quick_empty = TRUE
-	click_gather = TRUE
-	max_w_class = WEIGHT_CLASS_NORMAL
-	max_combined_w_class = 800
-	max_items = 400
-	display_numerical_stacking = TRUE
-
-/datum/component/storage/concrete/bluespace/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
-	. = ..()
-	if(!I.get_part_rating() && !stop_messages)
-		to_chat(M, "<span class='warning'>[parent] only accepts machine parts!</span>")
-		return FALSE
-=======
 /datum/component/storage/concrete/rped
 	collection_mode = COLLECT_EVERYTHING
 	allow_quick_gather = TRUE
@@ -64,4 +31,3 @@
 		if (!stop_messages)
 			to_chat(M, "<span class='warning'>[parent] only accepts machine par	ts!</span>")
 		return FALSE
->>>>>>> 52a7ebc... Refactors and fixes RPEDs (#37380)