Resolve Merge Conflict in README.md
Resolve Merge Conflict in README.md

Dbarnes1/military-features-data,Dbarnes1/military-features-data,tizzybec/military-features-data,Esri/military-features-data,Esri/military-features-data,tizzybec/military-features-data,Dbarnes1/military-features-data,tizzybec/military-features-data