rename repo
add cities to map
fix conflict