adding file b1
adding b2.txt
Merge remote-tracking branch 'origin'