add tmpl
resolved conflict