Switch from rebase to merge