rebase2 demo
resolved rebase conflicts