initial commit
modified file on featurebranch
modified file on masterbranch
merged
new line on master branch
new line on feature branch
failed merge
more changes to master branch
more changes to feature branch
merged
added line five on feature branch
added line five on master branch
merged
Merge remote-tracking branch 'origin/master'