minor tweak to @dir
resolve minor conflict