diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index d564386016c..22e8869bd6d 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -205,11 +205,7 @@ erpnext.stock.DeliveryNoteController = class DeliveryNoteController extends (
 				);
 			}
 
-<<<<<<< HEAD
-			if (doc.docstatus == 1) {
-=======
 			if (doc.docstatus == 1 && doc.status != "Completed" && frappe.model.can_create("Delivery Trip")) {
->>>>>>> 4f0214d00e (fix: completed DC will not appear in a delivery trip (#41655))
 				this.frm.add_custom_button(
 					__("Delivery Trip"),
 					function () {