changed toNameConflict a little bit