Deleted git merge junk and fixed the timeline
New timeline(page) javascript file