Fixing conflicts in the Nix code

Created by  pmeunier  on January 30, 2026
DO2ZEDXS6QKY7X7H37GLRZAYL672X6WXZCZDQBAVSV7I3TB6I3YAC
Change contents