If there isn't a headline, use the post title.
Added timeline events.
Resolved merge conflicts.