diff --git a/config/admins.txt b/config/admins.txt
index d02ce6a1bcc..a61086a22fd 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -1,6 +1,3 @@
-<<<<<<< .mine
-nodrak - Game Master
-carnwennan - Game Master=======
 quarxink - Game Master
 tle - Game Master
 xsi - Game Master
@@ -29,4 +26,6 @@ errorage - Game Master
 uhangi - Game Master
 superxpdude - Game Master
 petethegoat - Game Master
-korphaeron - Game Master>>>>>>> .r3825
+korphaeron - Game Master
+nodrak - Game Master
+carnwennan - Game Master
\ No newline at end of file