finished translator
merge conflict resolved