fix conflict name and template indentation