underscore templates
merge conflict