Fix the broken links
merge