Try doing a rebase first.