fixing templates
merge