change to timeline view
merge