fix conflicts
Merge branch 'master' of https://github.com/larryPersonal/Nanhua