diff --git a/addon/adapters/osf-adapter.js b/addon/adapters/osf-adapter.js
index <HASH>..<HASH> 100644
--- a/addon/adapters/osf-adapter.js
+++ b/addon/adapters/osf-adapter.js
@@ -6,7 +6,7 @@ import DS from 'ember-data';
 
 import HasManyQuery from 'ember-data-has-many-query';
 import config from 'ember-get-config';
-import GenericDataAdapterMixin from 'ember-osf/mixins/generic-data-adapter';
+import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin';
 
 
 let inflector = new Ember.Inflector(Ember.Inflector.defaultRules);
Update for merge conflicts.

[ci skip]