rename slide folder
fix merge