diff --git a/baystation12.dme b/baystation12.dme
index dec93932f0f..7c4b1fae920 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1403,11 +1403,7 @@
 #include "code\WorkInProgress\Aryn\Lighting\Engine.dm"
 #include "code\WorkInProgress\Aryn\Lighting\Light.dm"
 #include "code\WorkInProgress\Aryn\Lighting\Lightpoint.dm"
-<<<<<<< HEAD
-#include "code\WorkInProgress\Aryn\Lighting\Math.dm"
 #include "code\WorkInProgress\Cael_Aislinn\sculpture.dm"
-=======
->>>>>>> 9007aed... Fixed an annoying bug with giving another player a flashlight,
 #include "code\WorkInProgress\Cael_Aislinn\Jungle\falsewall.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle.dm"
 #include "code\WorkInProgress\Cael_Aislinn\Jungle\jungle_animals.dm"