Missed a second merge conflict in main.css, changed max #content width to 70em, removed duplicated footer tag on index