Revert "fixed conflict"

Conflicts:
	SwearJar_App/manifest.json