Fix sneaky bug when merging file lists