diff --git a/code/modules/uplink/uplink_devices.dm b/code/modules/uplink/uplink_devices.dm
index 4776b6e1ef..737f92a9ef 100644
--- a/code/modules/uplink/uplink_devices.dm
+++ b/code/modules/uplink/uplink_devices.dm
@@ -1,36 +1,3 @@
-<<<<<<< HEAD:code/game/objects/items/devices/uplink_devices.dm
-
-// A collection of pre-set uplinks, for admin spawns.
-/obj/item/device/radio/uplink/Initialize(mapload, _owner, _tc_amount = 20)
-	. = ..()
-	icon_state = "radio"
-	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-	LoadComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount)
-
-/obj/item/device/radio/uplink/nuclear/Initialize()
-	. = ..()
-	GET_COMPONENT(hidden_uplink, /datum/component/uplink)
-	hidden_uplink.set_gamemode(/datum/game_mode/nuclear)
-
-/obj/item/device/multitool/uplink/Initialize(mapload, _owner, _tc_amount = 20)
-	. = ..()
-	LoadComponent(/datum/component/uplink, _owner, FALSE, TRUE, null, _tc_amount)
-
-/obj/item/pen/uplink/Initialize(mapload, _owner, _tc_amount = 20)
-	. = ..()
-	LoadComponent(/datum/component/uplink)
-	traitor_unlock_degrees = 360
-
-/obj/item/device/radio/uplink/old
-	name = "dusty radio"
-	desc = "A dusty looking radio."
-
-/obj/item/device/radio/uplink/old/Initialize(mapload, _owner, _tc_amount = 10)
-	. = ..()
-	GET_COMPONENT(hidden_uplink, /datum/component/uplink)
-	hidden_uplink.name = "dusty radio"
-=======
 
 // A collection of pre-set uplinks, for admin spawns.
 /obj/item/device/radio/uplink/Initialize(mapload, _owner, _tc_amount = 20)
@@ -62,4 +29,3 @@
 	. = ..()
 	GET_COMPONENT(hidden_uplink, /datum/component/uplink)
 	hidden_uplink.name = "dusty radio"
->>>>>>> ea2c37c... Merge pull request #33276 from Cyberboss/FixUplinks:code/modules/uplink/uplink_devices.dm