diff --git a/requirements.txt b/requirements.txt
index 15604fe..6bd9f92 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,6 @@
 mysql-connector-python==8.0.29
-google-cloud-storage==2.5.0
\ No newline at end of file
+<<<<<<< HEAD
+google-cloud-storage==2.5.0
+=======
+google-cloud-storage==2.5.0
+>>>>>>> fd92c3d7ac25862e651876c9287408f2a9610730