Add simple
& simple
confilict fixed
test-no-ff
merge with no-ff
fix bug 101
merged bug fix 101
test stash
merge and fix conficts