branch test
branch test
modifed last line
& simple
conflict fixed
try --no-ff params
merge with no-ff
learn how to yong stash
merged bug fix 101