city name conflict
conflict resolved
three city names in the file