anchor.diff:  (defun encode-cimxml-slot (slot &optional value)
     (if (listp slot)
         (destructuring-bind (slot-name slot-value slot-type) slot
  -<<<<<<< HEAD
   	(encode-cimxml-slot* slot-name slot-value slot-type))
         (let ((type (cim-slot-type slot)))
   	(cond
  
positive.code: ;;    %SuperClass;>
  (defun encode-cimxml-class (class)
    (declare (type cim-class-declaration class))
  <<<<<<< HEAD
    (let ((super-class (cim-class-declaration-superclass class)))
  =======
    (let ((super-class (cim-class-superclasses class)))
  >>>>>>> 02939a2ceb4aa21517ae0cea0123d09fc62ece59
  	(if super-class
  	    (eformat "<CLASS NAME=\"~A\" SUPERCLASS=\"~A\">~%"
  		     (cim-name class)
  
negative.code:    `(("ObjectName" ,object-name ,(cond
  								  ((cim-instance-p object-name)
  								   :value.namedinstance)
  								  ((cim-class-declaration-p object-name)
  								   :class)
  								  (t (error "OBJECT-NAME must be a CIM-INSTANCE or a CIM-CLASS-DECLARATION"))))
  	 ,@(when assoc-class `(("AssocClass" ,assoc-class :classname)))
  