my change
Merge remote-tracking branch 'origin/master'
my change 2
Merge branch 'master' of https://github.com/dankirkd/hellogitworld
my change conflict
my change conflict resolved
my change conflict 2
my change conflict resolved 2