Fix the progress bar showing incorrect progress; only files that will actually be merged will now be counted.