upgrades now merging well