updating rel links for file system changes
fixing merge conflicts