Move to new merging approach for large numbers of files