trim files
Merge files