updates authentication
resolve merge conflicts