rename a folder and ready to merge