more leaflet integration
merge message