add conflict1.txt
Merge branch 'master' of https://github.com/fatbigbright/FBB_GitTest