Merge "File/folder add/delete"