add feature1
& simple
conflict fixed
new commit
merge with no-ff
fix bug 101
merged bug fix 101
fix bug stash
merge dev