update auth
merge