Fixed auto-merged error.

TripListTableViewController.swift has merged conflict.  This revision
fixed the conflict.