Deleted node_modules
Deleted node modules and dist(build location)
solved conflicts