finalize merge with upstream