Update translations
Fix conflict