More templates

- resolve conflitos