diff --git a/pyproject.toml b/pyproject.toml
index e35b52e..479aab8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -53,7 +53,11 @@ nbtest = [
     "nbmake>=1.5.0",
 ]
 style = [
+<<<<<<< HEAD
     "ruff==0.6.4",
+=======
+    "ruff==0.8.1",
+>>>>>>> 1157d1b (build(deps): bump ruff from 0.7.1 to 0.8.1 (#42))
     "nbqa>=1.8.5",
     "typos>=1.20.0",
 ]