branch test
AMND simple
& simple
conflict fixed
add merge
merge with no-ff
fix bug 112
merge bug fix 112
merge fix issue-112 bug
fix bug 113
merged bug fix 113
developed the dev
merge the dev