riga 1718
errori
Merge remote-tracking branch 'origin/master'