update slide
fix merge