Added node_modules for the gitignore file
resolved the conflicts