You've got two of these, did you not rebase/ff your branch?