fixed authors in main page.  also missed a merge conflict