b1 after rebase and merge