change dir.txt
merge from testbranch