modified:   file1.txt
	deleted:    file1.txt
Merge branch 'master' of https://github.com/mnkartik/TestRepo

Conflicts:
	file1.txt

	new file:   file1.txt