Calculate trip time

merged conflict