fix folderName
merge