diff --git a/app-shims.js b/app-shims.js
index 7f4c1bf..fa35a60 100644
--- a/app-shims.js
+++ b/app-shims.js
@@ -133,7 +133,7 @@
         'default': Ember.Object
       },
       'ember-platform': {
-        'assign':         Ember.merge,
+        'assign':         Ember.assign || Ember.merge,
         'create':         Ember.create,
         'defineProperty': Ember.platform.defineProperty,
         'hasAccessors':   Ember.platform.hasPropertyAccessors,