diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index 1f9451a87d2..4697e36778d 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -724,18 +724,3 @@ def create_pick_list(source_name, target_doc=None):
 	doc.set_item_locations()
 
 	return doc
-<<<<<<< HEAD
-=======
-
-
-@frappe.whitelist()
-def make_in_transit_stock_entry(source_name, in_transit_warehouse):
-	ste_doc = make_stock_entry(source_name)
-	ste_doc.add_to_transit = 1
-	ste_doc.to_warehouse = in_transit_warehouse
-
-	for row in ste_doc.items:
-		row.t_warehouse = in_transit_warehouse
-
-	return ste_doc
->>>>>>> c09a61f360 (fix: set `from_warehouse` and `to_warehouse` while mapping SE)