rebase vs merge test