set id for templates template
resolved conflicts