diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index 8a29ac877b0..41f609afb46 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -358,7 +358,10 @@ def update_status(name, status):
 	material_request.check_permission("write")
 	material_request.update_status(status)
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> e03d9aa889 (fix: unecessary keyword args were passed in mapper functions (#27563))
 @frappe.whitelist()
 def make_purchase_order(source_name, target_doc=None, args=None):
 	if args is None: