diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index cfe9d8442a9..978a7b41d69 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -96,18 +96,9 @@ frappe.ui.form.on("Material Request", {
 	refresh: function (frm) {
 		frm.events.make_custom_buttons(frm);
 		frm.toggle_reqd("customer", frm.doc.material_request_type == "Customer Provided");
-<<<<<<< HEAD
-=======
-		prevent_past_schedule_dates(frm);
 		frm.trigger("set_warehouse_label");
 	},
 
-	transaction_date(frm) {
-		prevent_past_schedule_dates(frm);
-		frm.set_value("schedule_date", "");
->>>>>>> 699e9b4452 (fix: label for warehouse based on material request type)
-	},
-
 	set_from_warehouse: function (frm) {
 		if (frm.doc.material_request_type == "Material Transfer" && frm.doc.set_from_warehouse) {
 			frm.doc.items.forEach((d) => {