Ah, then it should be fixed with `git rebase master` :)