Fix up manifest
     resolved conflicts
Conflicts:
	default.xml