Add auth fixes
fix merge conflicts