Fixed merge issue with package.json

Conflicts:
	package.json