fixed merge conflicts and got oAuth routes working