update base template
merge templates