update confilicts