third commit
commiting again
commiting again
Merge branch 'master' of github.com:atulp-iprogrammer/gitpractice
addition to ganesh.txt by atul
initial commit
initial commit
modified ganesh.txt file
changes to ganesh.txt
modified ganesh.txt file
initial commit
Merge branch 'master' of github.com:atulp-iprogrammer/gitpractice
changes to ganesh.txt
Merge branch 'master' of github.com:atulp-iprogrammer/gitpractice
commiting
Second commit
conflicts resolved
Merge branch 'master' of github.com:atulp-iprogrammer/gitpractice
Test
Merge branch 'master' of github.com:atulp-iprogrammer/gitpractice

Conflicts:
	ganesh.txt