diff --git a/doc/conf.py b/doc/conf.py
index 893e69a8..d69682f4 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -138,14 +138,6 @@
 
 # -- Intersphinx setup ----------------------------------------------------
 
-# Example configuration for intersphinx: refer to the Python standard library.
-<<<<<<< intersphinx_registry
+# Example configuration for intersphinx: refer to several Python libraries.
 
 intersphinx_mapping = get_intersphinx_mapping(packages=["python", "numpy", "sklearn"])
-=======
-intersphinx_mapping = {
-    "python": ("https://docs.python.org/3/", None),
-    "numpy": ("https://numpy.org/doc/stable/", None),
-    "sklearn": ("https://scikit-learn.org/stable/", None),
-}
->>>>>>> main