Test conflict on GitHub
Merge remote-tracking branch 'upstream/master'

Conflicts:
	testFile.xml
	
	Fixed the merge conflict and checked into repository.