add utf-8
merge & fix conflict