delete trip.trips.xml
Merge remote-tracking branch 'origin/Jiayi'