Change way of calculating conflicts