git commit --amend :2
Merge branch 'master' of https://github.com/zhongwencool/game