commit inserimento ste
merge and resolve conflicts