merge/fix links