fix template
merge