An unresoved merge conflict in German localisation