locales
fix conflicts