The verson can run, fix all conflicts in it.
Merge branch 'master' of https://github.com/shibai/cmpe273