fixed bug that caused incorrect num of conflicts to be returned