changed TripActivity to avoid merge conflict