diff --git a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts
index a00e0e88..d0ebdf71 100644
--- a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts
@@ -106,16 +106,9 @@ export class EditPartnerComponentsAddComponent implements OnInit {
           } as SFRadioWidgetSchema,
           enum: [
             { label: '修改成功后立即生效', value: 1 },
-<<<<<<< HEAD
             // { label: 'CRM流程审核通过后生效', value: 2 },
           ],
         },
-=======
-            { label: 'CRM流程审核后生效', value: 2 },
-            { label: 'CRM流程审核通过后生效', value: 3 }
-          ]
-        }
->>>>>>> ce53cdf83506568de0b8d5d43c83106c97e85545
       },
       required: ['channelId', 'remark', 'effectiveNode']
     };
diff --git a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts
index c87ae14f..0ce1ec43 100644
--- a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts
@@ -80,16 +80,9 @@ export class EditSaleComponentsAddComponent implements OnInit {
           } as SFRadioWidgetSchema,
           enum: [
             { label: '修改成功后立即生效', value: 1 },
-<<<<<<< HEAD
             // { label: 'CRM流程审核通过后生效', value: 2 },
           ],
         },
-=======
-            { label: 'CRM流程审核后生效', value: 2 },
-            { label: 'CRM流程审核通过后生效', value: 3 }
-          ]
-        }
->>>>>>> ce53cdf83506568de0b8d5d43c83106c97e85545
       },
       required: ['channelId', 'remark', 'effectiveNode']
     };