Revert "test di un conflict"

This reverts commit 14595bc2082a90c80acb8cdad4ef3483c5b4d74a.