changed template
update template
fix merge problen