sets up authentification
fixes merge conflicts