Fetaure 1
Feature-2
Merge pull request #3 from rajeshhs/Feature-1

Fetaure 1
conflict
Merge branch 'develop' of local repository into Feature-2
Conflicts resolved
Merge pull request #5 from rajeshhs/Feature-2

Feature-2
Merge pull request #6 from rajeshhs/develop

Develop