fixed timeline formatting
fixed merge conflict in html