Add deduplication support for conflicting mappings