Ember cli merged