From 1416982ad77307a7099d14a94f07bea4ae2765b2 Mon Sep 17 00:00:00 2001
From: "Robert P. Goldman" <rpgoldman@sift.net>
Date: Mon, 23 Oct 2023 22:25:09 -0500
Subject: [PATCH] Fix (?) symbol name conflict.

---
 shop3/pddl/pddl-helpers.lisp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/shop3/pddl/pddl-helpers.lisp b/shop3/pddl/pddl-helpers.lisp
index e4f4530d..b385e73b 100644
--- a/shop3/pddl/pddl-helpers.lisp
+++ b/shop3/pddl/pddl-helpers.lisp
@@ -18,12 +18,12 @@
 (defpackage shop3-pddl-helpers
   (:use #:common-lisp #:iterate #:pddl-utils #:shop3)
   (:nicknames #:shop3.pddl.helpers #:shop2-pddl-helpers)
-  (:shadowing-import-from #:pddl-utils #:problem)
+  ;;(:shadowing-import-from #:pddl-utils #:problem)
   (:shadowing-import-from #:shop3
                           #:domain-name #:make-problem #:domain
-                          #:problem
+                          ;; #:problem
                           #:*validator-progname*)
-  (:shadow #:problem-name)
+  (:shadow #:problem-name #:problem)
   (:export #:typed-object-list->facts
            #:translate-openstacks-problem
            #:check-repair
@@ -51,7 +51,7 @@
                (every #'(lambda (x) (or (eq (first x) :add)
                                         (eq (first x) :delete)))
                       (rest divergence))))
-  (let* ((effects 
+  (let* ((effects
            (iter (for (op literal) in (rest divergence))
              (collecting
               (ecase op