worked on timeline
fixed merge errors