目录合并，删除冗余
Merge remote-tracking branch 'origin/master'