metoda add si show
Merge conflict