Merge upgrade steps