modificare eroare first upstream merge