diff --git a/README.md b/README.md
index 1c6b0d5..ee5431c 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,10 @@ Developers should set up a PlantCV conda environment from source code as normal,
 
 ```bash
 cd plantcv-geospatial
+<<<<<<< Updated upstream
 pip install -e . --config-settings editable_mode=strict
 
+=======
+pip install -e . 
+>>>>>>> Stashed changes
 ```