diff --git a/requirements.txt b/requirements.txt
index c9e85842..8fa8076c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,10 @@ SALib>=1.4.5
 seaborn
 sympy>=1.8
 matplotlib<=3.6.0
+<<<<<<< Updated upstream
 # numpy<2.0.0
+=======
+>>>>>>> Stashed changes
 
 # Specifically for docs
 sphinx