fixed templates
fixed merge conflict