Updating conflicts