directory -> folder
merge folder-not-directory