diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index 2de1546a1ba..20dec47faa9 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -205,18 +205,12 @@ erpnext.buying.PurchaseOrderController = class PurchaseOrderController extends e
 					}
 				}
 
-<<<<<<< HEAD
-				if(is_drop_ship && doc.status!="Delivered") {
-					this.frm.add_custom_button(__('Delivered'),
-						this.delivered_by_supplier, __("Status"));
-=======
 				if (is_drop_ship && doc.status != "Delivered") {
 					this.frm.add_custom_button(
 						__("Delivered"),
 						this.delivered_by_supplier.bind(this),
 						__("Status")
 					);
->>>>>>> 41649cf52d (fix: bind this to function)
 
 					this.frm.page.set_inner_btn_group_as_primary(__("Status"));
 				}
@@ -591,4 +585,4 @@ frappe.ui.form.on("Purchase Order", "is_subcontracted", function(frm) {
 	if (frm.doc.is_old_subcontracting_flow) {
 		erpnext.buying.get_default_bom(frm);
 	}
-});
\ No newline at end of file
+});