delete lesser links, keep the good ones
fix merge conflicts