diff --git a/config/admin_ranks.txt b/config/admin_ranks.txt
index 77d52eb871..3cf5cbfb72 100644
--- a/config/admin_ranks.txt
+++ b/config/admin_ranks.txt
@@ -42,8 +42,4 @@ Lazy Master 	= +EVERYTHING -AUTOLOGIN
 
 Host			= +EVERYTHING
 
-<<<<<<< HEAD
-Coder			= +DEBUG +VAREDIT +SERVER +SPAWN
-=======
-Coder			= +DEBUG +VAREDIT +SERVER +SPAWN +POLL -AUTOLOGIN
->>>>>>> 4e929c7... Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on. (#33480)
+Coder			= +DEBUG +VAREDIT +SERVER +SPAWN -AUTOLOGIN