resolve conflict
Conflicts:
	source
clarify content model for datalist (CR variant)