Merge conflict fix

Conflicts:
	PotatoPosse/AndroidManifest.xml