Changed hyperlinks
Fixes
resolved merge conflict