Fix up bad merge for auth