Ok, could you fix the conflicts while you're there, then? It was the block of commented-out HTML near the top of About.cshtml.