user auth
fix merge