ProgressiveAuthentication skeleton
fix conflict