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

Replacement for pull-request #207, makes auto resolving conflicts optional