diff --git a/baystation12.dme b/baystation12.dme
index d66db268f8a..90bce9b897d 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -774,10 +774,10 @@
 #include "code\modules\customitems\item_defines.dm"
 #include "code\modules\customitems\item_spawning.dm"
 #include "code\modules\destilery\main.dm"
-#include "code\modules\DetectiveWork\detective_work.dm"
-#include "code\modules\DetectiveWork\evidence.dm"
-#include "code\modules\DetectiveWork\footprints_and_rag.dm"
-#include "code\modules\DetectiveWork\scanner.dm"
+#include "code\modules\detectivework\detective_work.dm"
+#include "code\modules\detectivework\evidence.dm"
+#include "code\modules\detectivework\footprints_and_rag.dm"
+#include "code\modules\detectivework\scanner.dm"
 #include "code\modules\events\alien_infestation.dm"
 #include "code\modules\events\blob.dm"
 #include "code\modules\events\brand_intelligence.dm"
diff --git a/config/admins.txt b/config/admins.txt
index 2c7fafa3593..f80ff5334e5 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -5,7 +5,8 @@
 # Ranks can be anything defined in admin_ranks.txt           ~Carn   #
 ######################################################################
 
-chinsky - Game Master
+abi79 - Game Master
+arcalane - Game Admin
 asanadas - Game Admin
 bobbehluvspropane - Game Admin
 cacophony - Game Admin
diff --git a/config/moderators.txt b/config/moderators.txt
index d956734e232..d4874564c24 100644
--- a/config/moderators.txt
+++ b/config/moderators.txt
@@ -16,7 +16,7 @@ roaper
 searif
 sparklysheep
 themij
-;chinsky
+chinsky
 danny220
 ; Why u no keep list in alphabetical order?! Lazies! Lazies! -Abi
 ; Imma best alphabetiser - Erthilo
diff --git a/html/changelog.html b/html/changelog.html
index b8a9c849d58..7ffa4bf5824 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -79,8 +79,6 @@ should be listed in the changelog upon commit though. Thanks. -->
 </div>
 
 <div class="commit sansserif">
-<<<<<<< HEAD
-=======
 	<h2 class="date">13/01/2013</h2>
 	<h3 class="author">Chinsky updated:</h3>
 	<ul class="changes bgimages16">
@@ -139,7 +137,6 @@ should be listed in the changelog upon commit though. Thanks. -->
 </div>
 
 <div class="commit sansserif">
->>>>>>> 090495f3865a1283beacfa5cb62cd42c4c76b3ce
 	<h2 class="date">November 2012 - January 2013</h2>
 	<h3 class="author">chinsky updated:</h3>
 	<ul class="changes bgimages16">