create a package.json
forever added
conflict fixed