The noblest man
Fixed up the bad commit message
tweaked the file to test diff between staged and working
tweaked to see branch
added a message for branching and merging
Merge branch 'feature'

tests merge feature
new title enhancement
change to force a merge issue
Merge branch 'feature2'
setting up master for a merge conflict