rebase and merge into 1commit#