Added another line after line 1
Added line 2
Merge branch 'anotherline'

Conflicts:
	test.txt