geofence fix
fixed merge conflicts