diff --git a/code/game/machinery/pointdefense.dm b/code/game/machinery/pointdefense.dm
index 6d4cc34768..4413917d3a 100644
--- a/code/game/machinery/pointdefense.dm
+++ b/code/game/machinery/pointdefense.dm
@@ -25,15 +25,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
 	. = ..()
 	if(id_tag)
 		//No more than 1 controller please.
-<<<<<<< HEAD
-		for(var/thing in GLOB.pointdefense_controllers)
-			var/obj/machinery/pointdefense_control/PC = thing
-||||||| parent of 0dcdc6d7d5... Merge pull request #11179 from VOREStation/Arokha/opt
-		for(var/thing in pointdefense_controllers)
-			var/obj/machinery/pointdefense_control/PC = thing
-=======
 		for(var/obj/machinery/pointdefense_control/PC as anything in pointdefense_controllers)
->>>>>>> 0dcdc6d7d5... Merge pull request #11179 from VOREStation/Arokha/opt
 			if(PC != src && PC.id_tag == id_tag)
 				warning("Two [src] with the same id_tag of [id_tag]")
 				id_tag = null
@@ -108,15 +100,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
 		var/new_ident = input(user, "Enter a new ident tag.", "[src]", id_tag) as null|text
 		if(new_ident && new_ident != id_tag && user.Adjacent(src) && CanInteract(user, GLOB.tgui_physical_state))
 			// Check for duplicate controllers with this ID
-<<<<<<< HEAD
-			for(var/thing in GLOB.pointdefense_controllers)
-				var/obj/machinery/pointdefense_control/PC = thing
-||||||| parent of 0dcdc6d7d5... Merge pull request #11179 from VOREStation/Arokha/opt
-			for(var/thing in pointdefense_controllers)
-				var/obj/machinery/pointdefense_control/PC = thing
-=======
 			for(var/obj/machinery/pointdefense_control/PC as anything in pointdefense_controllers)
->>>>>>> 0dcdc6d7d5... Merge pull request #11179 from VOREStation/Arokha/opt
 				if(PC != src && PC.id_tag == id_tag)
 					to_chat(user, "<span class='warning'>The [new_ident] network already has a controller.</span>")
 					return
@@ -222,15 +206,7 @@ GLOBAL_LIST_BOILERPLATE(pointdefense_turrets, /obj/machinery/pointdefense)
 	if(!id_tag)
 		return null
 	var/list/connected_z_levels = GetConnectedZlevels(get_z(src))
-<<<<<<< HEAD
-	for(var/thing in GLOB.pointdefense_controllers)
-		var/obj/machinery/pointdefense_control/PDC = thing
-||||||| parent of 0dcdc6d7d5... Merge pull request #11179 from VOREStation/Arokha/opt
-	for(var/thing in pointdefense_controllers)
-		var/obj/machinery/pointdefense_control/PDC = thing
-=======
 	for(var/obj/machinery/pointdefense_control/PDC as anything in pointdefense_controllers)
->>>>>>> 0dcdc6d7d5... Merge pull request #11179 from VOREStation/Arokha/opt
 		if(PDC.id_tag == id_tag && (get_z(PDC) in connected_z_levels))
 			return PDC