new feature
newdir
conflict fixed