add qtemplate
fix merge