dev branch
and simple
&simple
conflict fixed
add dev
merge with no-ff
fix a bug
merge bug