fixing merging of files