add branch
AND simple'
& simple
conflict fixed
add dev
merge wit no-ff
fix bugs 101
merged bug fix 101
after issue-101
after issue-101