diff --git a/pyproject.toml b/pyproject.toml
index ef425315..d1072768 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -69,10 +69,7 @@ dev = [
 [tool.pytest.ini_options]
 markers = [
     "slow: marks tests as slow (T > 10s)",
-<<<<<<< HEAD
-=======
     "regression: marks regression tests",
->>>>>>> wip: new baselines
 ]
 
 [tool.isort]