diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index af03ebd8b6..582efaa474 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -27,15 +27,10 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 								"Computer Parts"
 								)
 
-<<<<<<< HEAD
 	var/datum/component/material_container/materials
 
 /obj/machinery/r_n_d/circuit_imprinter/Initialize()
-	materials = AddComponent(/datum/component/material_container, list(MAT_GLASS, MAT_GOLD, MAT_DIAMOND, MAT_METAL, MAT_BLUESPACE),
-=======
-/obj/machinery/rnd/circuit_imprinter/Initialize()
 	materials = AddComponent(/datum/component/material_container, list(MAT_GLASS, MAT_GOLD, MAT_DIAMOND, MAT_METAL, MAT_BLUESPACE), 0,
->>>>>>> 09ec914... Fixes certain material containers (#33370)
 		FALSE, list(/obj/item/stack, /obj/item/ore/bluespace_crystal), CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert))
 	materials.precise_insertion = TRUE
 	create_reagents(0)