Upstream merge progress