Folder merge