modified file on masterbranch
merged
new line on master branch
failed merge
more changes to master branch
merged
added line five on master branch
merged
Initial commit
Merge remote-tracking branch 'origin/master'
potential bad merge
merged
added text
added file that I forgot
added things to master branch
added newFileAddedOnMaster to master branch
added text to newFile on master branch
added new file to featurebranch
added text to newFile on feature branch
added text to newFile on feature branch