merge timeline and storymap in progress