clean up fork diff from upstream