update conflict