fix merge

Author: mikeland73

internal/nix/install.go

@@ -58,11 +58,7 @@ func EnsureNixInstalled(ctx context.Context, writer io.Writer, withDaemonFunc fu
 	if BinaryInstalled() {
 		return nil
 	}
-<<<<<<< HEAD
-	if dirExistsAndIsNotEmpty() {
-=======
 	if dirExistsAndIsNotEmpty("/nix") {
->>>>>>> ascknx/main
 		if _, err = SourceProfile(); err != nil {
 			return err
 		} else if BinaryInstalled() {