diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
index ee6c7a89cae..014f188d04d 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -560,9 +560,14 @@ def get_item_from_material_requests_based_on_supplier(source_name, target_doc=No
 def get_supplier_tag():
 	filters = {"document_type": "Supplier"}
 	tags = list(set(tag.tag for tag in frappe.get_all("Tag Link", filters=filters, fields=["tag"]) if tag))
+<<<<<<< HEAD
 
 	return tags
 
+=======
+
+	return tags
+>>>>>>> 50fe23308a (fix: Tags getting fetched correctly in Get Supplier in RFQ (Request For Quotation) (#27499))
 
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs