Is this part of your diff? I think you might have merged or rebased something without changing your upstream branch.