Conflicts (simple): pkgs/os-specific/linux/util-linux/default.nix It seems this merge creates a new stdenv hash, because we had changes on both branches :-/
