Correct conflicting mappings