diff --git a/plugins/admin.sma b/plugins/admin.sma
index 9161ff9f..e3ddedb2 100755
--- a/plugins/admin.sma
+++ b/plugins/admin.sma
@@ -37,15 +37,9 @@
 
 #include <amxmodx>
 #include <amxmisc>
-<<<<<<< admin.sma
-#include <amxconst>
-#include <string>
-#include <file>
-=======
 #if defined USING_SQL
 #include <dbi>
 #endif
->>>>>>> 1.25
 
 #define MAX_ADMINS 64
 
@@ -353,4 +347,4 @@ public ackSignal(id) {
 }
 
 public client_authorized(id)
-  return get_cvar_num( "amx_mode" ) ? accessUser( id ) : PLUGIN_CONTINUE
\ No newline at end of file
+  return get_cvar_num( "amx_mode" ) ? accessUser( id ) : PLUGIN_CONTINUE