diff --git a/app/Controllers/Admin/Cloudflare/API/AuthController.php b/app/Controllers/Admin/Cloudflare/API/AuthController.php
index a51a10b..3d5511b 100644
--- a/app/Controllers/Admin/Cloudflare/API/AuthController.php
+++ b/app/Controllers/Admin/Cloudflare/API/AuthController.php
@@ -19,11 +19,7 @@ class AuthController extends APIController
                 'fields' => ['id', 'authkey', 'status'],
                 'fieldFilters'  => ['status'],
                 'fieldRules' => [
-<<<<<<< HEAD
                     'id'                => 'required|valid_email|is_unique[cloudflareauth.id]',
-=======
-                    'id'                => 'required|valid_email|is_unique[cloudfalreauth.id]',
->>>>>>> 7a1ac9e12bcf17ab3a24e56840567972bd755755
                     'authkey'           => 'required|min_length[10]|max_length[200]',
                     'status'            => 'required|in_list[use,unuse]',
                 ],