Translate stuff
merge conflict