fix merging timeline