add b.txt
Merge branch 'master' of https://github.com/neouniverse/ConflictTest