diff --git a/code/__defines/subsystems.dm b/code/__defines/subsystems.dm
index 7395f980dc0..d24f0bfdd60 100644
--- a/code/__defines/subsystems.dm
+++ b/code/__defines/subsystems.dm
@@ -57,11 +57,8 @@ var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_G
 #define INIT_ORDER_SKYBOX		30
 #define INIT_ORDER_MAPPING		25
 #define INIT_ORDER_DECALS		20
-<<<<<<< HEAD
-#define INIT_ORDER_PLANTS		18 // Must initialize before atoms.
-=======
+#define INIT_ORDER_PLANTS		19 // Must initialize before atoms.
 #define INIT_ORDER_PLANETS		18
->>>>>>> 5195438... Optimizes SSplanets initialization (#8015)
 #define INIT_ORDER_JOB			17
 #define INIT_ORDER_ALARM		16 // Must initialize before atoms.
 #define INIT_ORDER_ATOMS		15