diff --git a/doc/requirements.in b/doc/requirements.in
index df0b2f34d80..9d7568e3c63 100644
--- a/doc/requirements.in
+++ b/doc/requirements.in
@@ -4,5 +4,14 @@ 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 441ab0baab0..6f396792aa9 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -23,9 +23,17 @@ 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