Parallel merge upgrade