no message

src/types/components.d.ts

@@ -117,7 +117,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
     IEpCollection: typeof import('~icons/ep/collection')['default']
     IEpDelete: typeof import('~icons/ep/delete')['default']
     IEpDownload: typeof import('~icons/ep/download')['default']
@@ -135,14 +134,6 @@ declare module '@vue/runtime-core' {
     IEpTop: typeof import('~icons/ep/top')['default']
     IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IEpUser: typeof import('~icons/ep/user')['default']
-=======
-    IEpDelete: typeof import('~icons/ep/delete')['default']
-    IEpEdit: typeof import('~icons/ep/edit')['default']
-    IEpPlus: typeof import('~icons/ep/plus')['default']
-    IEpRefresh: typeof import('~icons/ep/refresh')['default']
-    IEpSearch: typeof import('~icons/ep/search')['default']
-    IEpSetting: typeof import('~icons/ep/setting')['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']