添加历史机制
Merge remote-tracking branch 'origin/master'