fixed some merge conflicts on authservice.js