diff --git a/code/__defines/subsystems.dm b/code/__defines/subsystems.dm
index 60ab7ab7e3f..182739be8a3 100644
--- a/code/__defines/subsystems.dm
+++ b/code/__defines/subsystems.dm
@@ -54,11 +54,8 @@ var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_G
 // The numbers just define the ordering, they are meaningless otherwise.
 #define INIT_ORDER_WEBHOOKS		50
 #define INIT_ORDER_SQLITE		40
-<<<<<<< HEAD
 #define INIT_ORDER_GARBAGE		39
 #define INIT_ORDER_MEDIA_TRACKS	38 // Gotta get that lobby music up, yo
-=======
->>>>>>> c463104999a... Ports Diagonal Movement (#8199)
 #define INIT_ORDER_INPUT		37
 #define INIT_ORDER_CHEMISTRY	35
 #define INIT_ORDER_VIS			32