Fixing conflicts in the mapping