integrare partiala la view and update issue
resolved conflicts