branch test
and simple
he simple
fix conflicts
I love git
merge with no-ff
git is a free software
merged bug fix 101