fix nrOfFolders
merge