diff --git a/.gitignore b/.gitignore
index 51518d3..08ac508 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
@@ -25,3 +26,7 @@ yarn-debug.log*
 yarn-error.log*
 client\node_modules
 server\node_modules
+=======
+client/node_modules
+server/node_modules
+>>>>>>> git ignore node modules