diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index bbd665e..c8ccfc9 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -8,10 +8,6 @@
 # pin when possible.  Writing an issue against the offending project and
 # linking to it here is good.
 
-# Not sure why I'm getting cannot-enumerate-pytest-fixtures failures:
-# https://github.com/reverbc/pylint-pytest/issues/20
-pylint-pytest==1.0.3
-
 # docutils is causing problems for sphinx_rtd_theme, but doc8 wants to force it
 # forward. Hold back doc8 while everyone resolves their issues.
 # https://github.com/readthedocs/sphinx_rtd_theme/issues/1323
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 86d872d..cadc090 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -75,7 +75,9 @@ distlib==0.3.8
     #   -r requirements/tox.txt
     #   virtualenv
 doc8==0.11.2
-    # via -r requirements/quality.txt
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/quality.txt
 docutils==0.20.1
     # via
     #   -r requirements/quality.txt
@@ -241,7 +243,7 @@ pylint==3.1.0
     # via
     #   -r requirements/quality.txt
     #   pylint-pytest
-pylint-pytest==1.0.3
+pylint-pytest==1.1.7
     # via -r requirements/quality.txt
 pyproject-api==1.6.1
     # via
diff --git a/requirements/doc.txt b/requirements/doc.txt
index 99958ce..7a6a782 100644
--- a/requirements/doc.txt
+++ b/requirements/doc.txt
@@ -29,7 +29,9 @@ cogapp==3.4.1
 coverage==7.5.1
     # via -r requirements/test.txt
 doc8==0.11.2
-    # via -r requirements/doc.in
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/doc.in
 docutils==0.20.1
     # via
     #   doc8
diff --git a/requirements/quality.txt b/requirements/quality.txt
index 3949a8c..3bc832e 100644
--- a/requirements/quality.txt
+++ b/requirements/quality.txt
@@ -55,18 +55,10 @@ coverage==7.5.1
 dill==0.3.8
     # via pylint
 doc8==0.11.2
-<<<<<<< HEAD
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/doc.txt
 docutils==0.20.1
-||||||| parent of ac0c398 (chore: make upgrade)
-    # via -r requirements/doc.txt
-docutils==0.19
-=======
-    # via -r requirements/doc.txt
-docutils==0.20.1
->>>>>>> ac0c398 (chore: make upgrade)
     # via
     #   -r requirements/doc.txt
     #   doc8
@@ -209,7 +201,7 @@ pylint==3.1.0
     # via
     #   -r requirements/quality.in
     #   pylint-pytest
-pylint-pytest==1.0.3
+pylint-pytest==1.1.7
     # via -r requirements/quality.in
 pyproject-hooks==1.1.0
     # via build