Merge in all changes from the old hive, replaced updated files with old.