Fixed small conflicts in Translator.