[api] Allow disabling of conflict-overwrite via options.forceSave
Merge pull request #241 from sreuter/master

[api] Allow disabling of conflict-overwrite via options.forceSave