fix some merge conflicts again; fix link