branch test
AND simple
&simple
confilict fixed
and -> &
merge with on-ff
fix bug 101
merged bug fix 101
Branch dev
Git has different.
change