diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 50071efe4e..deda8dbc1e 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -29,8 +29,15 @@ FLOOR SAFES
 	tumbler_2_pos = rand(0, 72)
 	tumbler_2_open = rand(0, 72)
 
+<<<<<<< HEAD
 
 /obj/structure/safe/Initialize()
+=======
+	if(. != INITIALIZE_HINT_QDEL)
+		return INITIALIZE_HINT_LATELOAD
+
+/obj/structure/safe/LateInitialize()
+>>>>>>> ef923eb75d4... Merge pull request #8981 from Mechoid/SafesAreSafer
 	. = ..()
 	for(var/obj/item/I in loc)
 		if(space >= maxspace)
@@ -115,7 +122,7 @@ FLOOR SAFES
 				if(canhear)
 					to_chat(user, "<span class='notice'>You hear a [pick("click", "chink", "clink")] from \the [src].</span>")
 					playsound(src, 'sound/machines/click.ogg', 20, 1)
-			check_unlocked(user, canhear)		
+			check_unlocked(user, canhear)
 
 		updateUsrDialog()
 		return