updated template
resolved conflict