Add Geocode Gem
Fix conflicts