branch test
& simple
master
feature1
confilict fixed
remove dev
merge with no-ff
fix bug 101
merged bug fix 101