Added file merging