unfinish nix work
fix conflict