get all products
merge

Conflicts:
	package.json