utf-8 encoded strings && spanish translations
conflict resolution