Ok, it sounds like from the IRC chat yesterday, and the discussion above, that I should just resolve the merge conflicts and re-push. I will do that. Let me know if that's not the case.