@Add
release note on upsert api change to conflict
unit tests for each conflict option