Merge the upstream.