trying another conflict
testing merge reset
Merge branch 'master' of github.com:imranazad/try_git