diff --git a/.gitignore b/.gitignore
index b185958..64d2f13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,6 @@
 client/node_modules
-server/node_modules
\ No newline at end of file
+<<<<<<< HEAD
+server/node_modules
+=======
+server/node_modules
+>>>>>>> 68eacf2750f54cccc2941c4e9e5e454525c23bd3