Reduce diff with upstream