add lines to b
Merge remote-tracking branch 'origin/branch-b'