template fix
Theme merge