From 2550b44db88869b7cc23eb32d19e36d8bbf9cb30 Mon Sep 17 00:00:00 2001
From: Mihir Kandoi <kandoimihir@gmail.com>
Date: Wed, 19 Nov 2025 12:38:47 +0530
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/manufacturing/doctype/bom/bom.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index af1eac402e6..89f90e1658c 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -796,13 +796,8 @@ class BOM(WebsiteGenerator):
 						"stock_uom": d.stock_uom,
 						"conversion_factor": d.conversion_factor,
 						"sourced_by_supplier": d.sourced_by_supplier,
-<<<<<<< HEAD
-					}
-=======
-						"is_phantom_item": d.is_phantom_item,
 					},
 					notify=False,
->>>>>>> 074f07694f (fix: redundant message on bom save)
 				)
 
 			d.base_rate = flt(d.rate) * flt(self.conversion_rate)