Fixed merge in locales.