ashish
Brahminder
Merge pull request #3 from SaurabhB/master

Sau.txt
Merge pull request #5 from ashishnirmohi/master

ashish
editing sau.txt
Merge pull request #4 from brahminder/master

brahm.txt
amit
Merge pull request #6 from tanharocks/master

a text file
Resolving conflicts