Fixed conflicts with package.json