Added directories to package.json
Fixed merge conflict