diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 5fa718564f4..d42d6c0e563 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -163,7 +163,7 @@
 
 	if (recipe.time)
 		to_chat(user, "<span class='notice'>Building [recipe.title] ...</span>")
-		if (!do_after(user, recipe.time, exclusive = TRUE))
+		if (!do_after(user, recipe.time))
 			return
 
 	if (use(required))
diff --git a/vorestation.dme b/vorestation.dme
index 5d1aabd37b8..3406d36cbc9 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -3799,6 +3799,7 @@
 #include "code\ZAS\Zone.dm"
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
+<<<<<<< HEAD:vorestation.dme
 #include "maps\gateway_archive_vr\blackmarketpackers.dm"
 #include "maps\offmap_vr\om_ships\abductor.dm"
 #include "maps\southern_cross\items\clothing\sc_accessory.dm"
@@ -3807,6 +3808,9 @@
 #include "maps\southern_cross\loadout\loadout_head.dm"
 #include "maps\southern_cross\loadout\loadout_suit.dm"
 #include "maps\southern_cross\loadout\loadout_uniform.dm"
+=======
+#include "maps\southern_cross\southern_cross.dm"
+>>>>>>> 236524a... Merge pull request #7824 from Mechoid/FixSheetRecipes:polaris.dme
 #include "maps\submaps\_helpers.dm"
 #include "maps\submaps\_readme.dm"
 #include "maps\submaps\engine_submaps\engine.dm"