Nested Addon Build Failures

[offirgolan]

Im trying to include this addon in my addon but I'm getting issues regarding the index.js file. I was able to resolve it by using the method noted here:

rwjblue/ember-cli-pretender@dda9bf8

But after that I recieved the following:

Merge error: file assets/select2.png exists in /blah/blah/blah
Pass option { overwrite: true } to mergeTrees in order to have the latter file win.

Im on Ember 1.12.1 and Ember CLI 0.2.7.

There is an issue about this here (maybe that can help):
ember-cli/ember-cli#3718