basic auth set
merge fixed