Merge branch 'master' of github.com:PraveenTPG/ProjectGit
changes index file
remove conflicts
adding abc
adding for tag2
removing conflicts
adding in Branch
adding code for merge
Merge branch 'master' of github.com:PraveenTPG/ProjectGit into Branch1