branch test
hello way!
AND simple
&simple
confilct rixed
add merge
merge with no-ff
rewrite
git re
way rich
del way rich
add way rich