There were merge conflicts while merging a new upstream version.