Removed `Ember.merge` from the list of 2.x deprecations. Per emberjs/ember.js#13344 it is being undeprecated.
Removed `Ember.merge` from the list of 2.x deprecations. Per emberjs/ember.js#13344 it is being undeprecated.

workmanw/ember-website,zeppelin/emberjs-website,zeppelin/emberjs-website,workmanw/ember-website,SaladFork/emberjs-website,kpfefferle/website,AaronSikes/website,SaladFork/emberjs-website,SaladFork/emberjs-website,zeppelin/emberjs-website,AaronSikes/website,josemarluedke/ember-website,zeppelin/emberjs-website,bmac/website,AaronSikes/website,bmac/website,SaladFork/emberjs-website,bmac/website,kpfefferle/website,josemarluedke/ember-website,bmac/website,workmanw/ember-website,josemarluedke/ember-website,workmanw/ember-website,josemarluedke/ember-website,kpfefferle/website