Merge the two geolocate branches.