time spans lasting an hour or less can now generate trips.
Fixed merge?