Folder rename conflict fixed