add config utf-8
fix conflict