fix to incorrect merge on folder class names