added dir change
merge changes