diff --git a/world/world_105_115 b/world/world_105_115
index 1774a1688..36c753de4 100644
--- a/world/world_105_115
+++ b/world/world_105_115
@@ -1657,11 +1657,6 @@ x 3
 y 43
 speed_left -94.099998
 end
-arch fountain
-x 3
-y 43
-speed_left -94.099998
-end
 arch dungeon_magic
 x 3
 y 44
@@ -1720,27 +1715,6 @@ arch grass
 x 3
 y 48
 elevation 10832
-<<<<<<< HEAD
-<<<<<<< HEAD
-end
-arch fountain
-x 3
-y 48
-speed_left -94.099998
-=======
->>>>>>> f2564454c (Add missing elevation)
-end
-arch fountain
-x 3
-y 48
-speed_left -94.099998
-=======
->>>>>>> 936034922 (Add missing elevation)
-end
-arch fountain
-x 3
-y 48
-speed_left -94.099998
 end
 arch fountain
 x 3
diff --git a/world/world_128_109 b/world/world_128_109
index bdf15c53f..16c1126aa 100644
--- a/world/world_128_109
+++ b/world/world_128_109
@@ -4187,10 +4187,6 @@ arch lamppost
 x 16
 y 4
 end
-arch lamppost
-x 16
-y 4
-end
 arch dungeon_floor
 x 16
 y 5
@@ -4215,10 +4211,6 @@ arch lamppost
 x 16
 y 8
 end
-arch lamppost
-x 16
-y 8
-end
 arch dungeon_floor
 x 16
 y 9
@@ -4253,10 +4245,6 @@ arch lamppost
 x 16
 y 14
 end
-arch lamppost
-x 16
-y 14
-end
 arch dungeon_floor
 x 16
 y 15