More merge fixes.
switch fork link to ribbon.