Add deduplication support for conflicting mappings
Merge pull request #35 from pvlugter/deduplicate

Add deduplication support for conflicting mappings