All Small
AllSmall
Learning to delete files - Poem deleted
put Poem back in
Moved Poem to Pome
moving files to another directory
AllSmall on master
new branch change
Merged feature branch
feature2 change
mutated master
Merge branch 'feature2'
..
nn
Merge branch 'feature2'

ok try to merge and fail?
add two lines