Use a different tactic for determining conflicts. Give more priority to setting False very old versions.