Fixing merge conflicts

main.css
category_links.html
meta.html
summary.html