branch dev
AND simple
 NO simple
 & simple1
conflict fixed
add merge
merge with no-ff
add -> and