Make Name Mapping mergeable

Hi,   A Name Mapping file is an xml file but its content is difficult to understand and impossible to merge. The current structure forces teams working on the same project to dedicate one personne ...