add more ...
modify test.txt at master branch
Merge branch 'v2'

Conflicts:
	test.txt