diff --git a/README.md b/README.md
index d534972..367e8ba 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,8 @@
 # Initial Commit :D
 
-<<<<<<< HEAD
 Run 'uv export --format requirements-txt --no-dev --no-emit-project --output-file requirements.txt' for major release versions (Maybe I make this a git actions thing?)
-Run uv run fastapi dev for dev environment
+Run 'uv run fastapi dev' for dev environment
 
 Recommended vscode extensions used for formatting: Ruff, Pylance. Use strict type checking.
-=======
-To run the devenvironment, run 'uv run fastapi dev'
 
 # Run 'uv export --format requirements-txt --no-dev --no-emit-project --output-file requirements.txt' for major release versions (Maybe I make this a git actions thing?)
->>>>>>> fbf731acb6404c94852d80d35ee16f2445eef414