diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index f1e63a3ce..247bc86cb 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -96,7 +96,15 @@ export default {
                         import('src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue'),
                 },
                 {
-<<<<<<< HEAD
+                    name: 'InvoiceInLog',
+                    path: 'log',
+                    meta: {
+                        title: 'log',
+                        icon: 'history',
+                    },
+                    component: () => import('src/pages/InvoiceIn/Card/InvoiceInLog.vue'),
+                },
+                {
                     name: 'InvoiceInCorrective',
                     path: 'corrective',
                     meta: {
@@ -105,15 +113,6 @@ export default {
                     },
                     component: () =>
                         import('src/pages/InvoiceIn/Card/InvoiceInCorrective.vue'),
-=======
-                    name: 'InvoiceInLog',
-                    path: 'log',
-                    meta: {
-                        title: 'log',
-                        icon: 'history',
-                    },
-                    component: () => import('src/pages/InvoiceIn/Card/InvoiceInLog.vue'),
->>>>>>> 013a00d653a4f2d2c766d8460d56fe62403fe3df
                 },
             ],
         },