branch b
commit from master
Merge branch 'branch_b'