diff --git a/racket-pdb.el b/racket-pdb.el
index a3a29aae..3ded489a 100644
--- a/racket-pdb.el
+++ b/racket-pdb.el
@@ -128,10 +128,10 @@ this mode."
          (racket-pdb-mode -1)
          (user-error "The Racket package `pdb` is not available so racket-pdb-mode cannot be used; instead maybe use racket-xp-mode"))
        (racket-pdb-analyze)
-       (setq-local racket--submod-path-function
+       (setq-local racket-submodules-at-point-function
                    #'racket-pdb-submodules-at-point))))
    (t
-    (setq-local racket--submod-path-function nil)
+    (setq-local racket-submodules-at-point-function nil)
     (racket-show nil)
     (racket--pdb-remove-all-face-overlays)
     (remove-hook 'after-change-functions
diff --git a/racket-util.el b/racket-util.el
index cc8b490a..ae48ba6a 100644
--- a/racket-util.el
+++ b/racket-util.el
@@ -153,7 +153,6 @@ The \"project\" is determined by trying, in order:
              (cdr (project-current nil dir)))
         dir)))
 
-<<<<<<< HEAD
 (defun racket--edit-mode-p ()
   (and (seq-some #'derived-mode-p '(racket-mode racket-hash-lang-mode)) t))
 
@@ -167,7 +166,6 @@ The \"project\" is determined by trying, in order:
   (unless (derived-mode-p 'racket-mode)
     (user-error "%S works only in racket-mode edit buffers"
                 this-command)))
-=======
 (defun racket--property-bounds (pos prop)
   (when-let (val (get-text-property pos prop))
     (let* ((prev-pos (previous-single-property-change pos prop))
@@ -180,7 +178,6 @@ The \"project\" is determined by trying, in order:
             (if (equal val next-val)
                 next-pos
               pos))))) ;pos is last char having prop val
->>>>>>> Initial commit to use "pdb" when available for check-syntax
 
 (provide 'racket-util)