branch test
and simple
& simple
conflict fixd
conflict fixed
gitskills commited
dev branch add
merge with no-ff
fix bug 101
merged bug fix 101
stash test finished