update conflicted and incident