fix templates and samples
fix slides
fix merge