added yelp gem
fixed conflicts in gem file