update to upstream version