rifiuti2: Add 'rifiuti' as a conflict.

This also makes style changes.