Mergeable user auth branch