fixing forgotten merge conflicts and translations