fix encodage utf-8
fix conflict