added Yelp call
fixed two conflicts