Conflict condition update