diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index f967b187f80..e1aa03e41de 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -120,8 +120,12 @@ class Quotation(SellingController):
 		if not self.has_sales_order():
 =======
 	def declare_enquiry_lost(self, lost_reasons_list, competitors, detailed_reason=None):
+<<<<<<< HEAD
 		if not self.is_fully_ordered() or self.is_partially_ordered():
 >>>>>>> 02f9441e1a (fix: Quotation lost update)
+=======
+		if not (self.is_fully_ordered() or self.is_partially_ordered()):
+>>>>>>> e457288dba (chore: fix condition)
 			get_lost_reasons = frappe.get_list("Quotation Lost Reason", fields=["name"])
 			lost_reasons_lst = [reason.get("name") for reason in get_lost_reasons]
 			frappe.db.set(self, "status", "Lost")