General cleanup of history sections.
Merge resolved.