diff --git a/code/game/objects/structures/gravemarker.dm b/code/game/objects/structures/gravemarker.dm
index fd8466bc916..715c051c58a 100644
--- a/code/game/objects/structures/gravemarker.dm
+++ b/code/game/objects/structures/gravemarker.dm
@@ -129,16 +129,6 @@
 		return
 	if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction))
 		return
-<<<<<<< HEAD
-	else
-		if(ismouse(usr))
-			return
-		if(!usr || !isturf(usr.loc))
-			return
-		if(usr.stat || usr.restrained())
-			return
-=======
->>>>>>> 8ec3691... Merge pull request #5770 from Atermonera/standard_rotation
 
 	src.set_dir(turn(src.dir, 270))
 	return
\ No newline at end of file
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index 529b8b47de4..8950533b8e6 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -75,21 +75,9 @@
 
 	if(!usr || !isturf(usr.loc))
 		return
-<<<<<<< HEAD
-	else
-		if(istype(usr,/mob/living/simple_mob/animal/passive/mouse))
-			return
-		if(!usr || !isturf(usr.loc))
-			return
-		if(usr.stat || usr.restrained())
-			return
-
-		src.set_dir(turn(src.dir, 90))
-=======
 	if(usr.stat || usr.restrained())
 		return
 	if(ismouse(usr) || (isobserver(usr) && !config.ghost_interaction))
->>>>>>> 8ec3691... Merge pull request #5770 from Atermonera/standard_rotation
 		return
 
 	src.set_dir(turn(src.dir, 270))
diff --git a/vorestation.dme b/vorestation.dme
index 205706bfbcf..f58ce7bde7f 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -2591,8 +2591,8 @@
 #include "code\modules\projectiles\guns\modular_guns.dm"
 #include "code\modules\projectiles\guns\projectile.dm"
 #include "code\modules\projectiles\guns\vox.dm"
-#include "code\modules\projectiles\guns\energy\kinetic_accelerator_vr.dm"
 #include "code\modules\projectiles\guns\energy\hooklauncher.dm"
+#include "code\modules\projectiles\guns\energy\kinetic_accelerator_vr.dm"
 #include "code\modules\projectiles\guns\energy\laser.dm"
 #include "code\modules\projectiles\guns\energy\netgun_vr.dm"
 #include "code\modules\projectiles\guns\energy\nuclear.dm"