update templates
update
fixes conflict