Better merge_with_upstrea