合并他人提交的内容
Merge remote-tracking branch 'origin/master'