Forgot to fix TemplatePanel during conflict