revert then back

revert from all in Chinese and reslove the conflict