conflict.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	testFile.xml
Resolved.