fixed trip
Merge