diff --git a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
index 32240db54..7976b7ac4 100644
--- a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
+++ b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
@@ -14,7 +14,7 @@ import type { ResponseData } from "@/modules/05_placement/interface/response/Tra
 import type { OpType } from "@/modules/05_placement/interface/response/Main";
 import type {
   DataListRow,
-  personType,
+  PersonType,
 } from "@/modules/11_discipline/interface/request/result";
 
 import DialogHeader from "@/components/DialogHeader.vue";
diff --git a/src/modules/11_discipline/components/4_Result/EditPage.vue b/src/modules/11_discipline/components/4_Result/EditPage.vue
index 53efffbb7..f289e611c 100644
--- a/src/modules/11_discipline/components/4_Result/EditPage.vue
+++ b/src/modules/11_discipline/components/4_Result/EditPage.vue
@@ -18,7 +18,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useDisciplineResultStore } from "@/modules/11_discipline/store/ResultStore";
 import { useQuasar } from "quasar";
 import DialogSendToCommand from "@/modules/11_discipline/components/4_Result/DialogSendToCommand.vue";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
 
 const mainStore = useDisciplineMainStore();
 const $q = useQuasar();
diff --git a/src/modules/11_discipline/interface/request/result.ts b/src/modules/11_discipline/interface/request/result.ts
index cdbc5b631..fe02f417e 100644
--- a/src/modules/11_discipline/interface/request/result.ts
+++ b/src/modules/11_discipline/interface/request/result.ts
@@ -25,18 +25,18 @@ interface DataListRow {
   resultDescription: string
 }
 
-interface PersonType{
-      id: string
-      idcard: string
-      name: string
-      prefix: string
-      firstName: string
-      lastName: string
-      position: string
-      positionLevel: string
-      salary: number
-      personId: string
-      posNo: string
-      organization: string
-  }
-export type { FormData, FormRef,DataOption,DataOptionRes,personType,DataListRow};
+interface PersonType {
+  id: string
+  idcard: string
+  name: string
+  prefix: string
+  firstName: string
+  lastName: string
+  position: string
+  positionLevel: string
+  salary: number
+  personId: string
+  posNo: string
+  organization: string
+}
+export type { FormData, FormRef, DataOption, DataOptionRes, PersonType, DataListRow };
diff --git a/src/modules/11_discipline/store/ResultStore.ts b/src/modules/11_discipline/store/ResultStore.ts
index d8657eb57..921aa5b66 100644
--- a/src/modules/11_discipline/store/ResultStore.ts
+++ b/src/modules/11_discipline/store/ResultStore.ts
@@ -12,13 +12,8 @@ import type {
 } from "@/modules/11_discipline/interface/response/result";
 import { useCounterMixin } from "@/stores/mixin";
 
-<<<<<<< HEAD
-import { useDisciplineMainStore } from "@/modules/11_discipline/store";
-
-=======
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
 import { useCounterMixin } from "@/stores/mixin";
->>>>>>> develop
 const mixin = useCounterMixin();
 const storeMain = useDisciplineMainStore();
 const { date2Thai } = mixin;