merge in latest from nix