diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 826cfd375..3df9c5c6c 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -438,11 +438,11 @@ const selectOption: any = [
 				  component: '' // 根据template注入的组件*/
 		},
 		{
-<<<<<<< HEAD
+
 			type: 'upload',
 			label: '图片/文件',
 			icon: 'image',
-			iconFont: 'fa-photo',
+			iconFont: 'fa-file-image-o',
 			control: {
 				modelValue: '' // 也可以是[{name:'',url:''}]形式
 			},
@@ -452,16 +452,7 @@ const selectOption: any = [
 				labelStyle:{},
 				inputStyle:{}
 			}
-=======
-		  type: 'upload',
-		  label: '图片/文件',
-		  icon: 'image',
-		  iconFont: 'fa-file-image-o',
-		  control: {
-			modelValue: '' // 也可以是[{name:'',url:''}]形式
-		  },
-		  config: {}
->>>>>>> liwenxuan_v4
+
 		},
 		{
 			type: 'tinymce',
@@ -533,16 +524,13 @@ const selectOption: any = [
 					interval:2000,
 				}
 			},
-<<<<<<< HEAD
+
 			config: {},
 			styles:{
 				divStyle:{},
 				labelStyle:{},
 				inputStyle:{}
 			}
-		}
-=======
-			config: {}
 		},
 		{
 			type: 'lowcodeTransfer',
@@ -604,7 +592,6 @@ const selectOption: any = [
 			},
 			config: {}
 		},
->>>>>>> liwenxuan_v4
 	]
 	},
 	{
diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue
index 2b224d6e0..1e153e613 100644
--- a/src/components/DesignForm/public/form/formGroup.vue
+++ b/src/components/DesignForm/public/form/formGroup.vue
@@ -458,14 +458,14 @@ const getFormItemLableStyle = (ele: any) => {
 					</div>
 					
 				</template>
-<<<<<<< HEAD
+
 
 				<DigitPage v-else-if="element.type === 'digitpage'" :data="element" />
 
-=======
+
 				<LowcodeImage  v-else-if="element.type === 'lowcodeImage'" :data="element" />
 				<LowcodeTransfer  v-else-if="element.type === 'lowcodeTransfer'" :data="element" />
->>>>>>> liwenxuan_v4
+
 				<VideoUpAndPlay  v-else-if="element.type === 'videoUpAndPlay'" :data="element" />
 				<LowcodeCarsusel  v-else-if="element.type === 'lowcodeCarsusel'" :data="element" />
 				<SignatureMap  v-else-if="element.type === 'signaturemap'" :data="element" />