update trip partial, user status in app.html.erb, update trips controller
fix conflict in trips controller