branch test modified test.txt
branch test modified today.txt
branch test1 modified test.txt and today.txt
Merge branch 'test1'

Conflicts:
	test.txt
	today.txt