brach dev
feature1
&simple
conflict fixed
add merge
merge with no-ff