baby.txt is increase file
a
new change
lala
tet
branch test
adasd
f1
master
conflict over
aa
g
f2
mm
a
dev
merge with no -ff
bug clean
merge bug fixed 101
find bug