fix call back url
merge