commit master-b
Merge branch 'master-b'