refactored and enabled the geoLocationLog
conflict resolution