conflict-test-1
conflict-test-2
Merge branch 'conflict-test-1' into conflict-test-2

Conflicts:
	conflict-test.txt