Added Hawthornbunny's Timeline Merge

Fixes #20