diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
index ece1f856..d207afac 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
@@ -13,7 +13,7 @@
       <div nz-row>
         <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.enterpriseInfoName }}</div>
         <div nz-col nzSpan="10">
-          <<<<<<< HEAD <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus  === '1'" acl
+         <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus  === '1'" acl
             [acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button>
             <button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus  === '1' && i?.serviceType === '2'" acl
               [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button>
@@ -21,16 +21,6 @@
               [acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button>
             <button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl
               [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button>
-            =======
-            <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
-              [acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button>
-            <button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'" acl
-              [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button>
-            <button nz-button (click)="updateGoodsSource(i)" *ngIf="i?.resourceStatus === '1'" acl
-              [acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button>
-            <button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl
-              [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button>
-            >>>>>>> 82c3801cc6ea10d8f6b895d85fe5553850672cea
         </div>
       </div>
       <div class="mt-sm mb-sm" nz-row>