update urls
merge