Update timeline scrolling
merge