Cathedral of Learning, barefoot.
Fix bad merge.