fixed template.php
merge