2
3
5
5
Merge branch 'fenzhi1'

Conflicts:
	a.txt
Merge branch 'master' of https://github.com/sforiz/Zigzag

Conflicts:
	a.txt