Let's try to re-enable the conflict prevention