diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 8fc39b832f..7576824747 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -193,22 +193,6 @@
 		/obj/item/stack/cable_coil = 1,
 		/obj/item/stock_parts/subspace/filter = 1)
 
-<<<<<<< HEAD
-/obj/item/circuitboard/machine/exonet_node
-	name = "Exonet Node(machine board)"
-	build_path = /obj/machinery/exonet_node
-	origin_tech = "programming=3;engineering=4;bluespace=3;materials=3"
-	req_components = list(
-							/obj/item/stock_parts/subspace/ansible = 1,
-							/obj/item/stock_parts/subspace/filter = 1,
-							/obj/item/stock_parts/manipulator = 2,
-							/obj/item/stock_parts/micro_laser = 1,
-							/obj/item/stock_parts/subspace/crystal = 1,
-							/obj/item/stock_parts/subspace/treatment = 2,
-							/obj/item/stack/cable_coil = 2)
-
-=======
->>>>>>> 92632ec... Merge pull request #32914 from kevinz000/NTNet
 /obj/item/circuitboard/machine/teleporter_hub
 	name = "Teleporter Hub (Machine Board)"
 	build_path = /obj/machinery/teleport/hub