test 1 commit
test2 commit
test3 commit
second
third
new3
test2

Conflicts:
	test2.txt