AND simple
& simple
Merge branch 'fea1'

Conflicts:
	gitTest.txt
add merge
merge with no-ff
bala bala bala...
密密麻麻