diff --git a/.gitignore b/.gitignore
index 64d2f13..14eab3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,2 @@
 client/node_modules
-<<<<<<< HEAD
 server/node_modules
-=======
-server/node_modules
->>>>>>> 68eacf2750f54cccc2941c4e9e5e454525c23bd3