nix commit
fix conflict