modeled trips
fix merge files