branch dev
AND simple
& simple
conflict fixed
and simple
merge with no-ff
and simple*3
fix bug 101