Merge with timeline