diff --git a/.cruft.json b/.cruft.json
index fdbc99c..51a3523 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/iterative/py-template",
-  "commit": "e4ec95f4cfd03d4af0a8604d462ee11d07d63b42",
+  "commit": "a27265793948b0cbbfb8d5fd26d380a7205d506e",
   "checkout": null,
   "context": {
     "cookiecutter": {
diff --git a/noxfile.py b/noxfile.py
index 1fa86b2..950b547 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -11,7 +11,11 @@
 
 
 @nox.session(
+<<<<<<<
     python=["3.8", "3.9", "3.10", "3.11", "3.12", "pypy3.8", "pypy3.9", "pypy3.10"]
+=======
+    python=["3.8", "3.9", "3.10", "3.11", "3.12", "pypy3.8", "pypy3.9", "pypy3.10"],
+>>>>>>>
 )
 def tests(session: nox.Session) -> None:
     session.install(".[tests]")
diff --git a/pyproject.toml b/pyproject.toml
index fbcd53e..fee21cc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -48,7 +48,14 @@ tests = [
   "pytest-asyncio>=0.21.0,<1",
   "pytest-cov>=4.1.0",
   "pytest-mock",
+<<<<<<<
   "pytest-sugar"
+=======
+  "pytest-sugar==0.9.5",
+  "pytest-cov==3.0.0",
+  "pytest-mock==3.8.2",
+  "mypy==1.9.0"
+>>>>>>>
 ]
 dev = [
   "morefs[tests,all]",
@@ -108,6 +115,16 @@ files = ["src", "tests"]
 ignore-words-list = "fo,cachable,afile"
 
 [tool.ruff]
+<<<<<<<
+=======
+output-format = "full"
+show-fixes = true
+
+[tool.ruff.lint]
+ignore = [
+  "S101",  # assert
+  "PLR2004",  # magic-value-comparison
+>>>>>>>
 output-format = "full"
 show-fixes = true
 
@@ -178,9 +195,15 @@ select = [
 ignore-variadic-names = true
 
 [tool.ruff.lint.flake8-pytest-style]
+<<<<<<<
 fixture-parentheses = false
 mark-parentheses = false
 parametrize-names-type = "csv"
+=======
+  "D213"  # multi-line-summary-second-line
+]
+select = ["ALL"]
+>>>>>>>
 
 [tool.ruff.lint.per-file-ignores]
 "noxfile.py" = ["D", "PTH"]