diff --git a/README.md b/README.md
index 9adf52c4..2b67334d 100644
--- a/README.md
+++ b/README.md
@@ -105,11 +105,11 @@ A collective list of JSON APIs for use in web development.
 | API | Description | OAuth |Link |
 |---|---|---|---|
 | OpenCage | Forward and reverse geocoding using open data | No | [Go!](https://geocoder.opencagedata.com) |
-<<<<<<< HEAD
 | Google Maps API | Create/customize digital maps based on Google Maps data | No, but `apiKey` query string | [Go!](https://developers.google.com/maps/) |
 | Mapbox | Create/customize beautiful digital maps | No, but `apiKey` query string | [Go!](https://www.mapbox.com/developers/) |
 | IP Address Details| Find geolocation with ip address | No | [Go!](https://ipinfo.io/) |
 | IP 2 Country | Map an IP to a country | No | [Go!](https://ip2country.info) |
+| GeoNames | Place names and other geographical data | No | [Go!](http://www.geonames.org/export/web-services.html) |
 
 ### Health
 
@@ -122,9 +122,6 @@ A collective list of JSON APIs for use in web development.
 | API | Description | OAuth |Link |
 |---|---|---|---|
 | Nutritionix | Worlds largest verified nutrition database | No, but `apiKey` query string | [Go!](https://developer.nutritionix.com/) |
-=======
-| GeoNames | Place names and other geographical data | No | [Go!](http://www.geonames.org/export/web-services.html) |
->>>>>>> 71ffc2ce0827cc9070d29d6426b495d221bada8c
 
 ### Media