diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm
index 3728e82d5b2..babaad28a5a 100644
--- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm
+++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm
@@ -9,10 +9,7 @@
 	density = 0
 	anchored = 1
 	store_mobs = 0
-<<<<<<< HEAD
-=======
 	wall_mounted = 1
->>>>>>> 041dc2a... Wall Locker Adjustments (#8093)
 
 //spawns 2 sets of breathmask, emergency oxy tank and crowbar