Fix merge conflict

Author: lkubb

pyproject.toml

@@ -83,11 +83,8 @@ tests = [
     "pytest>=7.2.0",
     "pytest-salt-factories>=1.0.0; sys_platform == 'win32'",
     "pytest-salt-factories[docker]>=1.0.0; sys_platform != 'win32'",
-<<<<<<< before updating
-    "pytest-subtests",
-=======
     "pytest-instafail",
->>>>>>> after updating
+    "pytest-subtests",
 ]
 
 [project.entry-points."salt.loader"]