Fixing a broken fwlink
fixing more fwlinks
fixing another linnk
fixed merge conflict #1292