merge with upgrade