added another word
added translator
resolved conflicts