Update Makefile

Author: timkpaine

Makefile

@@ -55,26 +55,16 @@ lint-py:  ## lint python with ruff
 	python -m ruff format --check verible
 
 lint-docs:  ## lint docs with mdformat and codespell
-<<<<<<< before updating
 	python -m mdformat --check README.md
-	python -m codespell_lib README.md
-=======
-	python -m mdformat --check README.md 
 	python -m codespell_lib README.md 
->>>>>>> after updating
 
 fix-py:  ## autoformat python code with ruff
 	python -m ruff check --fix verible
 	python -m ruff format verible
 
 fix-docs:  ## autoformat docs with mdformat and codespell
-<<<<<<< before updating
 	python -m mdformat README.md
 	python -m codespell_lib --write README.md
-=======
-	python -m mdformat README.md 
-	python -m codespell_lib --write README.md 
->>>>>>> after updating
 
 lint: lint-py lint-docs  ## run all linters
 lints: lint