Bug fix when reloading a trip
Fixed merge issue