add feature1
merge to bug1234
test merge tool
commit from master
resolve confilate
Merge branch 'master' of https://github.com/xujihui1985/GitFundamental