modify directory text length
Merge remote branch 'origin/master'