adding map
Fixed conflicts
Added ArcGIS as a service