diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index c2dc29064..e0a3166d9 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -127,13 +127,9 @@ declare module '@vue/runtime-core' {
     IEpDownload: typeof import('~icons/ep/download')['default']
     IEpEdit: typeof import('~icons/ep/edit')['default']
     IEpMessageBox: typeof import('~icons/ep/message-box')['default']
-<<<<<<< HEAD
     IEpMinus: typeof import('~icons/ep/minus')['default']
     IEpOperation: typeof import('~icons/ep/operation')['default']
     IEpPicture: typeof import('~icons/ep/picture')['default']
-=======
-    IEpOperation: typeof import('~icons/ep/operation')['default']
->>>>>>> v8_master
     IEpPlus: typeof import('~icons/ep/plus')['default']
     IEpPosition: typeof import('~icons/ep/position')['default']
     IEpRefresh: typeof import('~icons/ep/refresh')['default']
diff --git a/src/views/sysworkflow/codepage/page0318.vue b/src/views/sysworkflow/codepage/page0318.vue
index b9ec8476d..2e6ab3a91 100644
--- a/src/views/sysworkflow/codepage/page0318.vue
+++ b/src/views/sysworkflow/codepage/page0318.vue
@@ -212,3 +212,4 @@ onMounted(() => {
 }
 </style>
 
+