Ember.merge -> import merge
Merge pull request #4506 from trek/es6-ember-merge

Ember.merge -> import merge