Update conflict mechanism

Define behaviour for update conflict between manual edit and automatic ingest.

Discussion in Curation workflows Working doc

(notify: @anowak, @klaus.illmayer, @lbarbot )