b.txt created in master
Merge remote-tracking branch 'origin/master'