diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 7762c0420..e39ad0445 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /* eslint-disable */
 /* prettier-ignore */
 // @ts-nocheck
@@ -177,5 +176,3 @@ declare module '@vue/runtime-core' {
     vLoading: typeof import('element-plus/es')['ElLoadingDirective']
   }
 }
-=======
->>>>>>> v7_master