Conflicts - GitHub wouldn't auto-resolve them but my local git did: pkgs/development/cuda-modules/cuda/overrides.nix