fix broken GeoController.cs merge