fix document update conflict when conflict is local
fix document update conflict when conflict is local

* set isError, error
* reject error instead of throw

ampatspell/ember-cli-documents,ampatspell/ember-cli-documents