changes some links
fixes conflicts