package.json
README.md touched
fixed conficts