city name displaying in tooltip
resolving conflicts
fixed merge conflicts