use correct dir arg
merge