Merge "RCFilters: Update conflict messages"