modified:   test1.txt
	new file:   test1.1.txt
Merge branch 'sunny' of https://github.com/sunnycomes/test1 into sunny

Conflicts:
	test1.txt

	modified:   test1.txt
	modified:   test1.txt
	modified:   test1.txt
Merge branch 'sunny'

Conflicts:
	test1.txt

	new file:   test1.1.txt
	modified:   test1.txt
	modified:   test1.txt