Fix for changes related to merge-trees

Related to this [issue](https://github.com/stefanpenner/ember-cli/issues/265).