fix merging files