Added new line to b.txt
Merge branch 'branchA'