#150 full implementation
manually resolve conflict in es and fr messages