时不时的还是要提交以下
Merge remote-tracking branch 'refs/remotes/origin/master'