Issue edina/botanitours#3 introduce leaflet
fix merge conflict