brach dev
AND simple
&simple
conflict fixed
add merge
merge with no-ff
fix bug
dev job finish
Merge branch 'dev'