resolve merge conflicts

.gitlab-ci.yml

package/deps.mak

src/66/66-boot.c

src/66/66-parser.c

src/66/66-scandir.c

src/66/66-shutdownd.c

src/extra-tools/deps-exe/execl-envfile

src/extra-tools/deps-exe/execl-subuidgid

src/extra-tools/execl-envfile.c

src/extra-tools/execl-subuidgid.c

src/include/66/backup.h

src/include/66/constants.h

src/include/66/db.h

src/include/66/enum.h

src/include/66/environ.h

src/include/66/hpr.h

src/include/66/parser.h

src/include/66/rc.h

src/include/66/resolve.h

src/include/66/ssexec.h