timeline and memory
before merging
first merge