merge ember-cli addon branch