add rebase vs merge