fix template.pm
fix conflict