diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index 173c730bb31..7dc63da534f 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -701,10 +701,13 @@ class ProductionPlan(Document):
 			get_sub_assembly_items(row.bom_no, bom_data, row.planned_qty)
 			self.set_sub_assembly_items_based_on_level(row, bom_data, manufacturing_type)
 
+<<<<<<< HEAD
 		self.sub_assembly_items.sort(key=lambda d: d.bom_level, reverse=True)
 		for idx, row in enumerate(self.sub_assembly_items, start=1):
 			row.idx = idx
 
+=======
+>>>>>>> 78fe92542c (fix(ProdPlan): Get SubAssy Items does not work (#27537))
 	def set_sub_assembly_items_based_on_level(self, row, bom_data, manufacturing_type=None):
 		for data in bom_data:
 			data.qty = data.stock_qty