Dir file

merging