diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index b86222d90..be91366ad 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -128,12 +128,9 @@ declare module '@vue/runtime-core' {
     IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default']
     IEpSearch: typeof import('~icons/ep/search')['default']
     IEpSetting: typeof import('~icons/ep/setting')['default']
-<<<<<<< HEAD
     IEpTop: typeof import('~icons/ep/top')['default']
     IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IEpUser: typeof import('~icons/ep/user')['default']
-=======
->>>>>>> v7_master
     IEpView: typeof import('~icons/ep/view')['default']
     LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
     LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default']