Update templates
Fix conflict