delete one line
Merge branch 'v2'

Conflicts:
	branchv2