change encoding to utf-8
merge