make conflict computation more robust