Changed text in test-a
Changed text in test-b
Merge branch 'test-a'
Merge branch 'test-b'

Conflicts:
	branch 2 text file.txt