fixed handlebars merge issue