update/add update/add/insert does not support duplicate entries
Merge branch 'development', update/add/insert does not support duplicate entries"