diff --git a/components.d.ts b/components.d.ts
index 67ff3cc..a90f044 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -10,10 +10,6 @@ declare module 'vue' {
     Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCascader: typeof import('element-plus/es')['ElCascader']
-<<<<<<< HEAD
-=======
-    ElCol: typeof import('element-plus/es')['ElCol']
->>>>>>> dev-sy
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElForm: typeof import('element-plus/es')['ElForm']