diff --git a/noxfile.py b/noxfile.py
index 2fc0685..43b1343 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -1,7 +1,4 @@
-<<<<<<< Updated upstream
-=======
 import os
->>>>>>> Stashed changes
 import pathlib
 
 import nox
@@ -11,14 +8,11 @@
 OUTPUT_DIR = pathlib.Path(BUILD_DIR, "html")
 SOURCE_DIR = pathlib.Path(".")
 
-<<<<<<< Updated upstream
 # Sphinx output and source directories
 BUILD_DIR = "_build"
 OUTPUT_DIR = pathlib.Path(BUILD_DIR, "html")
 SOURCE_DIR = pathlib.Path(".")
 
-=======
->>>>>>> Stashed changes
 # Sphinx build commands
 SPHINX_BUILD = "sphinx-build"
 SPHINX_AUTO_BUILD = "sphinx-autobuild"
@@ -50,8 +44,6 @@ def docs(session):
         OUTPUT_DIR,
         *session.posargs,
     )
-<<<<<<< Updated upstream
-=======
 
 
 @nox.session(name="docs-test")
@@ -73,7 +65,6 @@ def docs_test(session):
     # When building the guide with additional parameters, also build the translations in RELEASE_LANGUAGES
     # with those same parameters.
     session.notify("build-translations", ["release-build", *TEST_PARAMETERS])
->>>>>>> Stashed changes
 
 
 @nox.session(name="docs-live")
@@ -91,10 +82,7 @@ def docs_live(session):
     ]
     for folder in AUTOBUILD_IGNORE:
         cmd.extend(["--ignore", f"*/{folder}/*"])
-<<<<<<< Updated upstream
-=======
 
->>>>>>> Stashed changes
     session.run(*cmd)