fix some merge glitches in pkgdeptests