Adding some conflicting text
Merge branch 'conflicts'

Conflicts:
	MergeTest