dev branch
AND simple
& simple
conflict fixed
add merge
add merge
merge with no-ff
fix bug 001
merged bug fix 001
exerise end
end