diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
index 4d996866..5d118b1f 100644
--- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
@@ -13,20 +13,12 @@
       <div nz-row>
         <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div>
         <div nz-col nzSpan="10">
-          <<<<<<< HEAD <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
-            [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
-            <button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
-              [acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
-            <button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl
-              [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
-            =======
             <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
               [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
             <button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
               [acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
             <button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl
               [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
-            >>>>>>> 82c3801cc6ea10d8f6b895d85fe5553850672cea
         </div>
       </div>
       <div class="mt-sm mb-sm" nz-row>