merge User auth branch