geolocate model
merge conflicts
more merge conflicts