Add folders and merge