small fix merging files