删除多余的逻辑
Merge remote-tracking branch 'origin/master'