Well, I mean, you just need to rebase so it doesn't conflict :P