fix up merging files