add line in b.txt
Merge branch 'master' of https://github.com/neouniverse/ConflictTest
add line a.txt from B