not on any branch
added new file to new branch
my second commit
added read me
Merge branch 'newbranch2'
Merge branch 'newbranch'
making a conflict made a neww branch
added from master branch
Merge branch 'conflict1'