more tweaks to Conflicts