Story create added
timeline controller merge solved