Sigh, still fixing...
Conflicts:
	package.json