diff --git a/.gitignore b/.gitignore
index 3ae4918..4b8cdb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< Updated upstream
 data/*.csv
 raw_data/
 *.ipynb_checkpoints
@@ -6,3 +7,10 @@ models/
 *.pt
 *.pth
 .ipynb_checkpoints/
+=======
+multitag/data/*.csv
+multitag/raw_data/
+multitag/.ipynb_checkpoints
+multitag/.vscode
+Uber Customer Reviews.csv
+>>>>>>> Stashed changes