This seems to be a mark of a merge conflict. Please review the  CHANGES_NEXT_RELEASE and commit an "integrated" version.