diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm
index 5e17ee9e89..8eb4c986de 100644
--- a/code/game/objects/effects/bump_teleporter.dm
+++ b/code/game/objects/effects/bump_teleporter.dm
@@ -1,26 +1,12 @@
-/obj/effect/bump_teleporter
-	name = "bump-teleporter"
-	icon = 'icons/mob/screen_gen.dmi'
-	icon_state = "x2"
-	var/id = null			//id of this bump_teleporter.
-	var/id_target = null	//id of bump_teleporter which this moves you to.
-	invisibility = INVISIBILITY_ABSTRACT 		//nope, can't see this
+/obj/effect/bump_teleporter
+	name = "bump-teleporter"
+	icon = 'icons/mob/screen_gen.dmi'
+	icon_state = "x2"
+	var/id = null			//id of this bump_teleporter.
+	var/id_target = null	//id of bump_teleporter which this moves you to.
+	invisibility = INVISIBILITY_ABSTRACT 		//nope, can't see this
 	anchored = TRUE
 	density = TRUE
-<<<<<<< HEAD
-	opacity = 0
-
-	var/static/list/AllTeleporters
-
-/obj/effect/bump_teleporter/New()
-	..()
-	LAZYADD(AllTeleporters, src)
-
-/obj/effect/bump_teleporter/Destroy()
-	LAZYREMOVE(AllTeleporters, src)
-	return ..()
-
-=======
 	opacity = 0
 
 	var/static/list/AllTeleporters
@@ -33,20 +19,18 @@
 	LAZYREMOVE(AllTeleporters, src)
 	return ..()
 
-
 /obj/effect/bump_teleporter/singularity_act()
 	return
 
 /obj/effect/bump_teleporter/singularity_pull()
 	return
 
->>>>>>> f912b6e... Fixes Lord Singuloth hungering for more than he should (#33025)
 /obj/effect/bump_teleporter/CollidedWith(atom/movable/AM)
 	if(!ismob(AM))
-		return
-	if(!id_target)
-		return
-
-	for(var/obj/effect/bump_teleporter/BT in AllTeleporters)
-		if(BT.id == src.id_target)
+		return
+	if(!id_target)
+		return
+
+	for(var/obj/effect/bump_teleporter/BT in AllTeleporters)
+		if(BT.id == src.id_target)
 			AM.forceMove(BT.loc) //Teleport to location with correct id.