Added nono-handlebars to bundle
Added edit-unmerged