persist UserProvider, fixed #2
fix merge conflict