finish 3rd party auth
merge