some merge conflicts remained, resolved them and finished linking to all pages