Commenting out some internal and external links for now
Fixed merge conflicts