correct findConflicts bug