Delayed the activity so geolocation shows
Fixed merge conflict in GeoLocationTracker