change language
fix conflicts