diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index eac9b2cde..adc4c86e3 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -125,18 +125,6 @@ declare module '@vue/runtime-core' {
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
     IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
     IEpClose: typeof import('~icons/ep/close')['default']
-<<<<<<< HEAD
-<<<<<<< HEAD
-    IEpEdit: typeof import('~icons/ep/edit')['default']
-    IEpMessageBox: typeof import('~icons/ep/message-box')['default']
-=======
-    IEpDelete: typeof import('~icons/ep/delete')['default']
-    IEpEdit: typeof import('~icons/ep/edit')['default']
-    IEpMessageBox: typeof import('~icons/ep/message-box')['default']
-    IEpOperation: typeof import('~icons/ep/operation')['default']
-    IEpPlus: typeof import('~icons/ep/plus')['default']
->>>>>>> lwx_v9
-=======
     IEpCollection: typeof import('~icons/ep/collection')['default']
     IEpDelete: typeof import('~icons/ep/delete')['default']
     IEpDownload: typeof import('~icons/ep/download')['default']
@@ -147,7 +135,6 @@ declare module '@vue/runtime-core' {
     IEpPicture: typeof import('~icons/ep/picture')['default']
     IEpPlus: typeof import('~icons/ep/plus')['default']
     IEpPosition: typeof import('~icons/ep/position')['default']
->>>>>>> v8_master
     IEpRefresh: typeof import('~icons/ep/refresh')['default']
     IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default']
     IEpSearch: typeof import('~icons/ep/search')['default']