branch test
and simple
& simple
& simple 2
conflict fixed
add merge
merge with on-ff
JG
fix bug 101
merge bug fix 101
bug stash
bug stash fix