You need to rebase the whole pull really. I did it locally so I could take into account several related changes and proceed if you didn't get to it this fast :)