did you need to rebase first or something?