update template
merge code