more tutorial
fix conflict in template