fixed another merge conflict for auth_service