diff --git a/code/controllers/subsystems/character_setup.dm b/code/controllers/subsystems/character_setup.dm
index 10e27aac53e..09875f6227b 100644
--- a/code/controllers/subsystems/character_setup.dm
+++ b/code/controllers/subsystems/character_setup.dm
@@ -29,7 +29,11 @@ SUBSYSTEM_DEF(character_setup)
 		save_queue.len--
 
 		if(!QDELETED(prefs))
+<<<<<<< HEAD
 			prefs.save_preferences()
+=======
+			SScharacter_setup.queue_preferences_save(prefs)
+>>>>>>> 59c8446... Merge pull request #6164 from Novacat/nova-runtimes
 
 		if(MC_TICK_CHECK)
 			return
diff --git a/vorestation.dme b/vorestation.dme
index d5af176d120..432353a8be3 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -218,7 +218,10 @@
 #include "code\controllers\subsystems\air.dm"
 #include "code\controllers\subsystems\airflow.dm"
 #include "code\controllers\subsystems\atoms.dm"
+<<<<<<< HEAD:vorestation.dme
 #include "code\controllers\subsystems\bellies_vr.dm"
+=======
+>>>>>>> 59c8446... Merge pull request #6164 from Novacat/nova-runtimes:polaris.dme
 #include "code\controllers\subsystems\character_setup.dm"
 #include "code\controllers\subsystems\circuits.dm"
 #include "code\controllers\subsystems\events.dm"