fixed trips database query in the trip controller
merging changes