add <<Three>>
<<Five>>
add <<Six>>
Merge branch 'newFeature'

Conflicts:
	FileA.txt
Merge branch 'master' of https://github.com/logicLeoChen/GT