change
merge
solve unicode issue