diff --git a/docs/requirements.txt b/docs/requirements.txt
index a7beba9..f794c3d 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,9 +1,6 @@
 numpy
 torch
 flipnslide
-<<<<<<< Updated upstream
-jupyter-book
-=======
 pandas
 numpy
 matplotlib
@@ -22,5 +19,4 @@ rasterio
 GDAL
 natsort
 stackstac
-jupyter-book
->>>>>>> Stashed changes
+jupyter-book
\ No newline at end of file