diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index cb41154..5ae08c6 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -2,11 +2,7 @@
 # Read the Docs configuration file
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 
-<<<<<<< HEAD
-version: "latest" 
-=======
 version: 1
->>>>>>> 306459b (Fixed ReadTheDocs support)
 
 build:
   os: fedora-40