Fix translations merge