Tag: property conflict resolution for NRIs