check with a merge if we really need a rebase