Update translations
Fix merge conflict
Resolve merge conflict