merged newtripcontroller and trip controller