sample conflict
Merge branch 'master' into dev

Conflicts:
	ondev.dita