branch test
and simple.
& simple
conflict fixed
sss
add merge
merge with no-ff
fix issue-101
merge with fix issue-101
add a line
merge with dev, and fix conflit
merge master to dev
test stash apply&drop
add feature
merge with remote origin