Sounds like it's missing a merge or rebase...