Fixed merge issue with compiled templates.