diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index 5bbda3a0986..521fb52ea92 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -2004,7 +2004,11 @@ def create_job_card(work_order, row, enable_capacity_planning=False, auto_create
 			"posting_date": nowdate(),
 			"for_quantity": row.job_card_qty or work_order.get("qty", 0),
 			"operation_id": row.get("name"),
+<<<<<<< HEAD
 			"bom_no": work_order.bom_no,
+=======
+			"bom_no": row.get("bom") or work_order.bom_no,
+>>>>>>> c6979ab260 (fix: use work_order bom_no if no bom present in operation)
 			"project": work_order.project,
 			"company": work_order.company,
 			"sequence_id": row.get("sequence_id"),