modified:   testfile1.txt
fsfds
	modified:   testfile1.txt
Merge branch 'master' of github.com:benilda/TestRepo

Conflicts:
	testfile1.txt

	modified:   testfile1.txt