minify templates
fix conflict