new line
Merge branch 't4a' of https://github.com/bruce66tw/test6 into t4a

Conflicts:
	t4a.txt
new line2