Merging progress before the overhaul