diff --git a/src/components/information/Address.vue b/src/components/information/Address.vue
index 8a4b32948..884ccbd70 100644
--- a/src/components/information/Address.vue
+++ b/src/components/information/Address.vue
@@ -89,7 +89,7 @@
             :class="getClass(edit)"
             :readonly="!edit"
             :borderless="!edit"
-            :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
+            :rules="[(val:string) => !!val || `${'กรุณาเลือกแขวง/ตำบล '}`]"
             :outlined="edit"
             dense
             lazy-rules
@@ -221,7 +221,7 @@
             :class="getClass(edit)"
             :readonly="!edit"
             :borderless="!edit"
-            :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
+            :rules="[(val:string) => !!val || `${'กรุณาเลือกแขวง/ตำบล '}`]"
             :outlined="edit"
             dense
             lazy-rules
diff --git a/src/modules/03_recruiting/components/Address.vue b/src/modules/03_recruiting/components/Address.vue
index 149bc9c61..6544ace9d 100644
--- a/src/modules/03_recruiting/components/Address.vue
+++ b/src/modules/03_recruiting/components/Address.vue
@@ -258,11 +258,7 @@ const getClass = (val: boolean) => {
           :class="getClass(status == 'checkRegister' || status == 'payment')"
           :readonly="!(status == 'checkRegister' || status == 'payment')"
           :borderless="!(status == 'checkRegister' || status == 'payment')"
-<<<<<<< HEAD
           :rules="[(val:string) => !!val || `${'กรุณาเลือกแขวง/ตำบล '}`]"
-=======
-          :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
->>>>>>> 62f1c818415d928fd00ea2ddbde5ab6143efa1a1
           :outlined="status == 'checkRegister' || status == 'payment'"
           dense
           lazy-rules
@@ -386,11 +382,7 @@ const getClass = (val: boolean) => {
           :class="getClass(status == 'checkRegister' || status == 'payment')"
           :readonly="!(status == 'checkRegister' || status == 'payment')"
           :borderless="!(status == 'checkRegister' || status == 'payment')"
-<<<<<<< HEAD
           :rules="[(val:string) => !!val || `${'กรุณาเลือกแขวง/ตำบล '}`]"
-=======
-          :rules="[(val:string) => !!val || `${'กรุณาเลือก แขวง/ตำบล '}`]"
->>>>>>> 62f1c818415d928fd00ea2ddbde5ab6143efa1a1
           :outlined="status == 'checkRegister' || status == 'payment'"
           dense
           lazy-rules