added timeline to find rides
merge conflict