fix .merge error and upgrade Ember \ Handlebars