trying to fix merge conflicts
Merge pull request #218 from ngds/map_search

trying to fix merge conflicts