Fixing unresolved merge conflict from Ricky's About page update