Fix Merge conflicts + Fix Broken links

Fix Merge conflicts + Fix Broken links