diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm
index 9d8de437a6..794cdf5b30 100644
--- a/code/game/machinery/computer/law.dm
+++ b/code/game/machinery/computer/law.dm
@@ -1,82 +1,3 @@
-<<<<<<< HEAD
-
-
-/obj/machinery/computer/upload
-	var/mob/living/silicon/current = null //The target of future law uploads
-	icon_screen = "command"
-
-/obj/machinery/computer/upload/attackby(obj/item/O, mob/user, params)
-	if(istype(O, /obj/item/aiModule))
-		var/obj/item/aiModule/M = O
-		if(src.stat & (NOPOWER|BROKEN|MAINT))
-			return
-		if(!current)
-			to_chat(user, "<span class='caution'>You haven't selected anything to transmit laws to!</span>")
-			return
-		if(!can_upload_to(current))
-			to_chat(user, "<span class='caution'>Upload failed!</span> Check to make sure [current.name] is functioning properly.")
-			current = null
-			return
-		var/turf/currentloc = get_turf(current)
-		if(currentloc && user.z != currentloc.z)
-			to_chat(user, "<span class='caution'>Upload failed!</span> Unable to establish a connection to [current.name]. You're too far away!")
-			current = null
-			return
-		M.install(current.laws, user)
-	else
-		return ..()
-
-/obj/machinery/computer/upload/proc/can_upload_to(mob/living/silicon/S)
-	if(S.stat == DEAD || S.syndicate)
-		return 0
-	return 1
-
-/obj/machinery/computer/upload/ai
-	name = "\improper AI upload console"
-	desc = "Used to upload laws to the AI."
-	circuit = /obj/item/circuitboard/computer/aiupload
-
-/obj/machinery/computer/upload/ai/attack_hand(mob/user)
-	if(..())
-		return
-
-	src.current = select_active_ai(user)
-
-	if (!src.current)
-		to_chat(user, "<span class='caution'>No active AIs detected!</span>")
-	else
-		to_chat(user, "[src.current.name] selected for law changes.")
-
-/obj/machinery/computer/upload/ai/can_upload_to(mob/living/silicon/ai/A)
-	if(!A || !isAI(A))
-		return 0
-	if(A.control_disabled)
-		return 0
-	return ..()
-
-
-/obj/machinery/computer/upload/borg
-	name = "cyborg upload console"
-	desc = "Used to upload laws to Cyborgs."
-	circuit = /obj/item/circuitboard/computer/borgupload
-
-/obj/machinery/computer/upload/borg/attack_hand(mob/user)
-	if(..())
-		return
-
-	src.current = select_active_free_borg(user)
-
-	if(!src.current)
-		to_chat(user, "<span class='caution'>No active unslaved cyborgs detected!</span>")
-	else
-		to_chat(user, "[src.current.name] selected for law changes.")
-
-/obj/machinery/computer/upload/borg/can_upload_to(mob/living/silicon/robot/B)
-	if(!B || !iscyborg(B))
-		return 0
-	if(B.scrambledcodes || B.emagged)
-		return 0
-=======
 
 
 /obj/machinery/computer/upload
@@ -154,5 +75,4 @@
 		return 0
 	if(B.scrambledcodes || B.emagged)
 		return 0
->>>>>>> 7a7798f... Cleans up remnant traitor cyborg code and AI hacking. (#35586)
-	return ..()
\ No newline at end of file
+	return ..()