Keep order & don't overwrite conflict in map rendering types
Add language