solve the conflict!
Merge branch 'master' of https://github.com/larryPersonal/Nanhua