去除无用代码，添加注释
Merge remote-tracking branch 'origin/master'