Merge pull request #6 from zhonglinyuan/master

Merge pull request #6 from GitNooby/master
deleted conflict test
Merge pull request #7 from GitNooby/master

deleting conflict test