fixes the list
translations
merge