diff --git a/src/components/DesignForm/app/formPage.vue b/src/components/DesignForm/app/formPage.vue
index 6dca40ce9..71b6849fc 100644
--- a/src/components/DesignForm/app/formPage.vue
+++ b/src/components/DesignForm/app/formPage.vue
@@ -97,11 +97,8 @@ const emits = defineEmits<{
 	(e: 'btnClick', type: string): void
 	(e: 'change', val: any): void // 表单组件值发生变化时
 	(e: 'update:issave', type: boolean): void
-<<<<<<< HEAD
 	(e: 'closePage', type: string): void
-=======
 	(e: 'optionsValue3Get3', val: any,fieldName: string): void 
->>>>>>> lwx_v11
 }>()
 
 const route = useRoute()
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index e76f50110..4830e0d58 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -378,13 +378,11 @@ const getFormItemLableStyle = (ele: any) => {
       return AnalysisCss(ele?.labelStyle)
     }
 }
-<<<<<<< HEAD
 
-=======
 function optionsValue3Get1(data: any,fieldName: string){
 	emits('optionsValue3Get2',data,fieldName)
 }
->>>>>>> lwx_v11
+
 </script>
 <template>
 	<draggable