diff --git a/code/game/objects/items/scrolls.dm b/code/game/objects/items/scrolls.dm
index 963dac5656..2fc8e8559c 100644
--- a/code/game/objects/items/scrolls.dm
+++ b/code/game/objects/items/scrolls.dm
@@ -1,79 +1,3 @@
-<<<<<<< HEAD
-/obj/item/teleportation_scroll
-	name = "scroll of teleportation"
-	desc = "A scroll for moving around."
-	icon = 'icons/obj/wizard.dmi'
-	icon_state = "scroll"
-	var/uses = 4
-	w_class = WEIGHT_CLASS_SMALL
-	item_state = "paper"
-	throw_speed = 3
-	throw_range = 7
-	origin_tech = "bluespace=6"
-	resistance_flags = FLAMMABLE
-
-/obj/item/teleportation_scroll/apprentice
-	name = "lesser scroll of teleportation"
-	uses = 1
-	origin_tech = "bluespace=5"
-
-
-
-/obj/item/teleportation_scroll/attack_self(mob/user)
-	user.set_machine(src)
-	var/dat = "<B>Teleportation Scroll:</B><BR>"
-	dat += "Number of uses: [src.uses]<BR>"
-	dat += "<HR>"
-	dat += "<B>Four uses, use them wisely:</B><BR>"
-	dat += "<A href='byond://?src=\ref[src];spell_teleport=1'>Teleport</A><BR>"
-	dat += "Kind regards,<br>Wizards Federation<br><br>P.S. Don't forget to bring your gear, you'll need it to cast most spells.<HR>"
-	user << browse(dat, "window=scroll")
-	onclose(user, "scroll")
-	return
-
-/obj/item/teleportation_scroll/Topic(href, href_list)
-	..()
-	if (usr.stat || usr.restrained() || src.loc != usr)
-		return
-	if (!ishuman(usr))
-		return 1
-	var/mob/living/carbon/human/H = usr
-	if(H.is_holding(src))
-		H.set_machine(src)
-		if (href_list["spell_teleport"])
-			if(uses)
-				teleportscroll(H)
-	if(H)
-		attack_self(H)
-	return
-
-/obj/item/teleportation_scroll/proc/teleportscroll(mob/user)
-
-	var/A
-
-	A = input(user, "Area to jump to", "BOOYEA", A) as null|anything in GLOB.teleportlocs
-	if(!src || QDELETED(src) || !user || !user.is_holding(src) || user.incapacitated() || !A || !uses)
-		return
-	var/area/thearea = GLOB.teleportlocs[A]
-
-	var/datum/effect_system/smoke_spread/smoke = new
-	smoke.set_up(2, user.loc)
-	smoke.attach(user)
-	smoke.start()
-	var/list/L = list()
-	for(var/turf/T in get_area_turfs(thearea.type))
-		if(!is_blocked_turf(T))
-			L += T
-
-	if(!L.len)
-		to_chat(user, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.")
-		return
-
-	user.forceMove(pick(L))
-
-	smoke.start()
-	uses--
-=======
 /obj/item/teleportation_scroll
 	name = "scroll of teleportation"
 	desc = "A scroll for moving around."
@@ -148,4 +72,3 @@
 
 	smoke.start()
 	uses--
->>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental