remove diff to upstream