diff --git a/erpnext/selling/report/inactive_customers/inactive_customers.py b/erpnext/selling/report/inactive_customers/inactive_customers.py
index 27bb71e332c..ea0831391d3 100644
--- a/erpnext/selling/report/inactive_customers/inactive_customers.py
+++ b/erpnext/selling/report/inactive_customers/inactive_customers.py
@@ -16,11 +16,7 @@ def execute(filters=None):
 	days_since_last_order = filters.get("days_since_last_order")
 	doctype = filters.get("doctype")
 
-<<<<<<< HEAD
 	if doctype not in ("Sales Order", "Sales Invoice"):
-=======
-	if doctype not in {"Sales Order", "Sales Invoice"}:
->>>>>>> 2ecf8b0466 (fix(inactive_customers): add allowlist for doctype filter and migrate to qb)
 		frappe.throw(_("Invalid value {0} for 'Doctype'").format(doctype))
 
 	if cint(days_since_last_order) <= 0: