diff --git a/doc/requirements.in b/doc/requirements.in
index 9d7568e3c63..c8a3a7692a2 100644
--- a/doc/requirements.in
+++ b/doc/requirements.in
@@ -4,14 +4,9 @@ sphinx-jsonschema
 sphinxnotes-strike
 # Pygments>=2.7.4 suggested by CVE-2021-20270 CVE-2021-27291
 Pygments >= 2.7.4
-<<<<<<< HEAD
-# Suggested by dependabot in https://github.com/haskell/cabal/pull/8807
-certifi >= 2022.12.7
-=======
 # CVE-2023-37920
 certifi >= 2023.07.22
 # CVE-2023-45803
 urllib3 >= 2.0.7
 # CVE-2024-22195
 jinja2 == 3.1.3
->>>>>>> f1908283c (update jinja2 per CVE-2024-22195)
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 6f396792aa9..b9cddab40e4 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -23,17 +23,11 @@ idna==2.10
     # via requests
 imagesize==1.4.1
     # via sphinx
-<<<<<<< HEAD
-jinja2==3.1.2
-    # via sphinx
-jsonpointer==2.1
-=======
 jinja2==3.1.3
     # via
     #   -r requirements.in
     #   sphinx
 jsonpointer==2.3
->>>>>>> f1908283c (update jinja2 per CVE-2024-22195)
     # via sphinx-jsonschema
 markupsafe==2.1.2
     # via jinja2