Do not create -conflict if versions are enabled