Update upstream diff