update leaflet-locate plugin
fix merge conflicts