removed some links
fix merge conflicts