Conflicts were

- Makefile: new target right were we define one, trivial resolution
- ci/release_docker_images: shell logic changed, no change in dependencies
- Tests (and support of them): again due to us using more recent hash values
  than this upstream version. Now the default branch of `gitlab-test` is
  expected to be `main` by upstream, which brings us closer to convergence.