How to reset to previous commit hash
merge master and resolved the conflicts
Merge pull request #3 from krishna-prasad/cherryPick

Cherry pick