fixed links
fixed merge conflicts