fixed merge conflicts on about page