Revert "Prova Conflitto"

This reverts commit 99806ad808d9966c5672f60d2413b4b50170b9b1.