fixed profile broken link and merge conflicts