branch test
add merge
merge with no-ff
gix bug 101
goodis godd
goodisdood