add hbs
merge