diff --git a/src/modules/06_retirement/router.ts b/src/modules/06_retirement/router.ts
index 973c598f2..bc2ae3219 100644
--- a/src/modules/06_retirement/router.ts
+++ b/src/modules/06_retirement/router.ts
@@ -4,16 +4,10 @@
 
 const Main = () => import("@/modules/06_retirement/views/Main.vue");
 const Listretirement = () => import("@/modules/06_retirement/components/ListRetirement/TableList.vue")
-<<<<<<< HEAD
 const resignOrder = () => import("@/modules/06_retirement/components/resign/ResignOrder.vue");
 const resign = () => import("@/modules/06_retirement/components/resign/Resign.vue");
 const resignByid = () => import("@/modules/06_retirement/components/resign/ResignByid.vue")
 const deceased = () => import("@/modules/06_retirement/components/resign/Deceased.vue")
-=======
-const DismissOrder = () => import("@/modules/06_retirement/components/DismissOrder/DismissOrder.vue")
-const AddOrder = () => import("@/modules/06_retirement/components/DismissOrder/AddOrder.vue")
-
->>>>>>> nice_dev
 export default [
   {
     path: "/retirement",
@@ -36,45 +30,26 @@ export default [
     },
   },
   {
-<<<<<<< HEAD
     path: "/retirement/resign",
     name: "resign",
     component: resign,
     meta: {
       Auth: true,
       Key: [7.2],
-=======
-    path: "/retirement/list/:id",
-    name: "retirement/list/id",
-    component: Listretirement,
-    meta: {
-      Auth: true,
-      Key: [7.1],
->>>>>>> nice_dev
       Role: "retirement",
     },
   },
   {
-<<<<<<< HEAD
     path: "/retirement/resign/:id",
     name: "resignbyid",
     component: resignByid,
     meta: {
       Auth: true,
       Key: [7.3],
-=======
-    path: "/retirement/dismiss-order",
-    name: "dismiss-order",
-    component: DismissOrder,
-    meta: {
-      Auth: true,
-      Key: [7.6],
->>>>>>> nice_dev
       Role: "retirement",
     },
   },
   {
-<<<<<<< HEAD
     path: "/retirement/resign-order",
     name: "resign-order",
     component: resignOrder,
@@ -95,15 +70,4 @@ export default [
     },
   },
   
-=======
-    path: "/retirement/dismiss-order/add",
-    name: "dismiss-order-add",
-    component: AddOrder,
-    meta: {
-      Auth: true,
-      Key: [7.6],
-      Role: "retirement",
-    },
-  },
->>>>>>> nice_dev
 ];