补充提交跳过conflict
Merge pull request #26 from wangxuecan/master

提交跳过conflict