branch dev
branch featuel
& simple
conflict fixed
add merge
merge with no-ff
fix bug_1