缺省了一个类
Merge remote-tracking branch 'origin/master'