modified find_conflicts