added adduser and authenticate
fixing merge conflict