fixed update conflict and outline update bug