commit
commit
commit
Merge branch 'test'

Conflicts:
	data2.txt