Resolved merge conflict in translations