fix unicode
fix
merge