specifying yelp
fixed merge
yelp
fixed maps from function
fixed merge conflicts
fixed merge conflicts