commit message
Merge remote-tracking branch 'github/master'
updated merge conflict
my change
Merge branch 'kevin'
my changes
my change
Merge remote-tracking branch 'origin/master'
my update