fixed update conflict