fix: Merge conflict inconsistency due to https://github.com/frappe/erpnext/pull/27931
diff --git a/erpnext/templates/includes/macros.html b/erpnext/templates/includes/macros.html
index 889cf1a..4741307 100644
--- a/erpnext/templates/includes/macros.html
+++ b/erpnext/templates/includes/macros.html
@@ -342,12 +342,12 @@
<label data-value="{{ attr_value }}">
<input type="checkbox"
class="product-filter attribute-filter"
- id="{{attr_value.name}}"
+ id="{{ attr_value }}"
data-attribute-name="{{ attribute.name }}"
- data-attribute-value="{{ attr_value.attribute_value }}"
+ data-attribute-value="{{ attr_value }}"
style="width: 14px !important"
{% if attr_value.checked %} checked {% endif %}>
- <span class="label-area">{{ attr_value.attribute_value }}</span>
+ <span class="label-area">{{ attr_value }}</span>
</label>
</div>
{% endfor %}