diff --git a/requirements-test.txt b/requirements-test.txt
index 2123019..aeab61d 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,3 +1,7 @@
 tox==4.23.2
 coverage==7.6.1
+<<<<<<< HEAD
 ruff==0.8.1
+=======
+ruff==0.7.4
+>>>>>>> parent of e8386a3 (Bump ruff from 0.7.4 to 0.8.0 (#564))