updated broken links
fixing merge conflicts on the liftoff page from my already pushed commits