增加错误处理代码
Merge remote-tracking branch 'origin/master'