Fix contributing

CONTRIBUTING.md

@@ -20,7 +20,6 @@ To install all dependencies, run:
 make install-deps
 ```
 
-<<<<<<< HEAD
 ### Formatting
 
 To format the code, run:
@@ -37,37 +36,13 @@ To detect all lint errors, run:
 make lint
 ```
 
-=======
-### Linting
-
->>>>>>> cf3f5f1 (WIP)
 To autocorrect all lint errors, run:
 
 ```bash
 make lint-fix
 ```
 
-<<<<<<< HEAD
-### Testing
-=======
-To detect all lint errors, run:
-
-```bash
-make lint
-```
-
-<<<<<<< HEAD
 ### Testing
-
-Install the `pytest` and `pytest-cov` packages to run tests:
-
-```bash
-pip install pytest pytest-cov
-```
-
->>>>>>> cf3f5f1 (WIP)
-=======
->>>>>>> 257ddef (Initial comments)
 To run all tests, run:
 
 ```bash
@@ -76,26 +51,8 @@ make test
 
 ### Generating Documentation
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 To build and view the documentation locally, run:
 
 ```bash
 make local-docs
-```
-=======
-To generate documentation from the Python docstrings, run:
-
-```bash
-make docs
-```
-
-To view the documentation, run:
-=======
-To build and view the documentation, run:
->>>>>>> 257ddef (Initial comments)
-
-```bash
-make local-docs
-```
->>>>>>> cf3f5f1 (WIP)
+```