branch test
feature branch
modifly & simple
conflict fixed
add merge manager
merge with no-ff
fix bug 101
merged bug fux 101