Adds userinfo
Fixes merge conflicts
everything works