fixed conflict in template.php