b edited
Merge branch 'bbb'
edit a in master
edit b in bbb