commit on dev
and simple
& simple
conflict fixed
add merge
merge with no-ff