Doing handlebars
Fixed merge conflict