- update links to reflect merge