{"action":"created","issue":{"url":"https://api.github.com/repos/altrim/ember-cli-tooltipster/issues/18","labels_url":"https://api.github.com/repos/altrim/ember-cli-tooltipster/issues/18/labels{/name}","comments_url":"https://api.github.com/repos/altrim/ember-cli-tooltipster/issues/18/comments","events_url":"https://api.github.com/repos/altrim/ember-cli-tooltipster/issues/18/events","html_url":"https://github.com/altrim/ember-cli-tooltipster/issues/18","id":118001187,"number":18,"title":"Upgrading from 0.0.11 to 0.1.0 throws a merge error","user":{"login":"chrissvo","id":2834982,"avatar_url":"https://avatars.githubusercontent.com/u/2834982?v=3","gravatar_id":"","url":"https://api.github.com/users/chrissvo","html_url":"https://github.com/chrissvo","followers_url":"https://api.github.com/users/chrissvo/followers","following_url":"https://api.github.com/users/chrissvo/following{/other_user}","gists_url":"https://api.github.com/users/chrissvo/gists{/gist_id}","starred_url":"https://api.github.com/users/chrissvo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/chrissvo/subscriptions","organizations_url":"https://api.github.com/users/chrissvo/orgs","repos_url":"https://api.github.com/users/chrissvo/repos","events_url":"https://api.github.com/users/chrissvo/events{/privacy}","received_events_url":"https://api.github.com/users/chrissvo/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"milestone":null,"comments":2,"created_at":"2015-11-20T09:34:03Z","updated_at":"2015-11-20T10:24:43Z","closed_at":"2015-11-20T10:20:44Z","body":"After upgrading from `0.0.11` to `0.1.0` and run `ember server` I get this error:\r\n\r\nMerge error: file `app/styles/app.scss` exists in `/tmp/broccoli_merge_trees-input_base_path-SblWTnuS.tmp/18` and `/tmp/broccoli_merge_trees-input_base_path-SblWTnuS.tmp/28`\r\nPass option `{ overwrite: true }` to mergeTrees in order to have the latter file win.\r\n\r\nI compared the 2 versions https://github.com/altrim/ember-cli-tooltipster/compare/3ce8815...811f764 and I think it is caused by `@import 'ember-paper';`. If I remove that from the add-on my ember app starts, but off course the add-on no longer works ;)\r\n\r\nAny suggestions on how I can fix this error? "},"comment":{"url":"https://api.github.com/repos/altrim/ember-cli-tooltipster/issues/comments/158349973","html_url":"https://github.com/altrim/ember-cli-tooltipster/issues/18#issuecomment-158349973","issue_url":"https://api.github.com/repos/altrim/ember-cli-tooltipster/issues/18","id":158349973,"user":{"login":"altrim","id":602300,"avatar_url":"https://avatars.githubusercontent.com/u/602300?v=3","gravatar_id":"","url":"https://api.github.com/users/altrim","html_url":"https://github.com/altrim","followers_url":"https://api.github.com/users/altrim/followers","following_url":"https://api.github.com/users/altrim/following{/other_user}","gists_url":"https://api.github.com/users/altrim/gists{/gist_id}","starred_url":"https://api.github.com/users/altrim/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/altrim/subscriptions","organizations_url":"https://api.github.com/users/altrim/orgs","repos_url":"https://api.github.com/users/altrim/repos","events_url":"https://api.github.com/users/altrim/events{/privacy}","received_events_url":"https://api.github.com/users/altrim/received_events","type":"User","site_admin":false},"created_at":"2015-11-20T10:24:43Z","updated_at":"2015-11-20T10:24:43Z","body":"@chrissvo Can you try this release https://github.com/altrim/ember-cli-tooltipster/releases/tag/v0.1.3 to check if it works for you ?"}}