Fix Link
Replace name with id.
Fix links.
resolved merge conflict