utf-8 fix
utf-8 conflict resolve