fixing dir
annoying merging changes