Working with node_modules
Updated merge conflicts