diff --git a/tk/listlogic.scm b/tk/listlogic.scm
index 66c7deb..6533b6b 100644
--- a/tk/listlogic.scm
+++ b/tk/listlogic.scm
@@ -68,5 +68,9 @@
      (begin (if (not $cond) (display $message))
             (newline)))
     ((display-if-not $cond . $messages)
+<<<<<<< HEAD
      (display-if-not $cond (string-concatenate/shared `$messages)))))
 
+=======
+     (display-if-not $cond (string-concatenate/shared '$messages)))))
+>>>>>>> dc21dc06718f65e8588149231d5bbf5cac5b46aa