fix urls
merge fix urls