tranlate/separate zh
style
fix conflict