Create a branch is quick
add simple
readme.txt
add simple
add f3
change f0
conflict solved
no fast forward
no fast forward
fix issue-101