diff --git a/tgstation.dme b/tgstation.dme
index bc8af51b99..3d6a9e1a2d 100755
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -163,7 +163,6 @@
 #include "code\_onclick\hud\robot.dm"
 #include "code\_onclick\hud\screen_objects.dm"
 #include "code\_onclick\hud\swarmer.dm"
-<<<<<<< HEAD
 #include "code\citadel\_cit_helpers.dm"
 #include "code\citadel\cit_areas.dm"
 #include "code\citadel\cit_arousal.dm"