装完新系统，测试一下
Merge remote-tracking branch 'origin/master'