Upstream, merge?