added all the new data for timeline
merge
git merge
git merge