fixed a bad merge + translation