Update default.xml
Conflicts:
	default.xml