Commit for conflict
Merged from conflicts
Merge remote-tracking branch 'origin/master'

Conflicts:
	aTestFile.txt