diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index b16039568f8..f19a74f3c42 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -290,9 +290,6 @@
 
 /atom/movable/proc/adjust_rotation(new_rotation)
 	icon_rotation = new_rotation
-<<<<<<< HEAD
-	update_transform()
-=======
 	update_transform()
 
 // Called when touching a lava tile.
@@ -305,4 +302,3 @@
 	for(var/item in src) // Notify contents of Z-transition. This can be overriden IF we know the items contents do not care.
 		var/atom/movable/AM = item
 		AM.on_z_change(old_z, new_z)
->>>>>>> afa149c... Adds New PoI Features + Bonus PoI (#5796)
diff --git a/code/game/turfs/simulated/outdoors/grass.dm b/code/game/turfs/simulated/outdoors/grass.dm
index d5009dd9e91..0742f6c51b4 100644
--- a/code/game/turfs/simulated/outdoors/grass.dm
+++ b/code/game/turfs/simulated/outdoors/grass.dm
@@ -29,13 +29,8 @@ var/list/grass_types = list(
 		/obj/structure/flora/sif/eyes
 		)
 
-<<<<<<< HEAD
-/turf/simulated/floor/outdoors/grass/sif/Initialize()
-	if(tree_chance && prob(tree_chance))
-=======
 /turf/simulated/floor/outdoors/grass/sif/Initialize()
 	if(tree_chance && prob(tree_chance) && !check_density())
->>>>>>> afa149c... Adds New PoI Features + Bonus PoI (#5796)
 		new /obj/structure/flora/tree/sif(src)
 	. = ..()
 
diff --git a/code/modules/mob/_modifiers/modifiers_misc.dm b/code/modules/mob/_modifiers/modifiers_misc.dm
index be5be67280b..fc714f30f81 100644
--- a/code/modules/mob/_modifiers/modifiers_misc.dm
+++ b/code/modules/mob/_modifiers/modifiers_misc.dm
@@ -180,8 +180,6 @@ the artifact triggers the rage.
 	accuracy = -75				// Aiming requires focus.
 	accuracy_dispersion = 3		// Ditto.
 	evasion = -45				// Too angry to dodge.
-<<<<<<< HEAD
-=======
 
 // Non-cult version of deep wounds.
 // Surprisingly, more dangerous.
diff --git a/vorestation.dme b/vorestation.dme
index 02f03559d96..a77c8a6a770 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1305,11 +1305,8 @@
 #include "code\game\turfs\simulated\floor_icon.dm"
 #include "code\game\turfs\simulated\floor_static.dm"
 #include "code\game\turfs\simulated\floor_types.dm"
-<<<<<<< HEAD:vorestation.dme
 #include "code\game\turfs\simulated\floor_types_vr.dm"
-=======
 #include "code\game\turfs\simulated\lava.dm"
->>>>>>> afa149c... Adds New PoI Features + Bonus PoI (#5796):polaris.dme
 #include "code\game\turfs\simulated\wall_attacks.dm"
 #include "code\game\turfs\simulated\wall_icon.dm"
 #include "code\game\turfs\simulated\wall_types.dm"