diff --git a/requirements.txt b/requirements.txt
index 4ff9299358d..e994d097eac 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,20 +1,10 @@
-<<<<<<< Updated upstream
-mkdocs==1.1.2
-mike
-=======
 mkdocs==1.2.2
->>>>>>> Stashed changes
 mkdocs-material
 mkdocs-macros-plugin
 mike
 mdx_truly_sane_lists
-<<<<<<< Updated upstream
-weasyprint==52.5
-mkdocs-with-pdf
-=======
->>>>>>> Stashed changes
 mkdocs_latest_release_plugin
 mkdocs-git-revision-date-localized-plugin
 weasyprint==52.5
 mkdocs-with-pdf
-qrcode
\ No newline at end of file
+qrcode